diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 15:17:58 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 15:17:58 +0000 |
| commit | 940a98e7e431b451886d9b7b7848fe41adfedaed (patch) | |
| tree | 39d79a2e46d556145394c48d20c691c4238d5c30 | |
| parent | 921ab036235a6db224160e64feff6df4da68f028 (diff) | |
| parent | 1a7cf2900ac8aa92e915cb6cfce177115bb7044c (diff) | |
Merge branch 'hotfix/0.16.0.1' into wdtk
Conflicts:
app/views/request/_view_html_stylesheet.html.erb
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | app/views/request/_view_html_prefix.html.erb | 4 | ||||
| -rw-r--r-- | app/views/request/_view_html_stylesheet.html.erb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index d6ed72cf6..4fa23e6cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rvm: - 1.9.3 - 2.0.0 before_install: + - gem update --system 2.1.11 - gem install rake --version=0.9.2.2 - git submodule update --init --recursive - psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres diff --git a/app/views/request/_view_html_prefix.html.erb b/app/views/request/_view_html_prefix.html.erb index 63caa98d4..63fac7c6d 100644 --- a/app/views/request/_view_html_prefix.html.erb +++ b/app/views/request/_view_html_prefix.html.erb @@ -1,9 +1,9 @@ <div class="view_html_prefix"> <div class="view_html_logo"> - <a href="/"><%= image_tag "navimg/logo-trans-small.png", :alt => site_name %></a> + <a href="/"><img src="/assets/navimg/logo-trans-small.png" alt="<%= site_name %>"></a> </div> <div class="view_html_download_link"> - <%=link_to _("Download original attachment"), @attachment_url %> + <%=link_to _("Download original attachment"), @attachment_url %> <br>(<%=h @attachment.name_of_content_type %>) </div> <%= _('This is an HTML version of an attachment to the Freedom of Information request')%> diff --git a/app/views/request/_view_html_stylesheet.html.erb b/app/views/request/_view_html_stylesheet.html.erb index e11fbdb63..125ce66ec 100644 --- a/app/views/request/_view_html_stylesheet.html.erb +++ b/app/views/request/_view_html_stylesheet.html.erb @@ -1 +1 @@ -<%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet" %> +<link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css"> |