diff options
| -rw-r--r-- | app/views/file_request/index.rhtml | 12 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 8 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 58 |
3 files changed, 24 insertions, 54 deletions
diff --git a/app/views/file_request/index.rhtml b/app/views/file_request/index.rhtml index 55a239e96..299a9eac4 100644 --- a/app/views/file_request/index.rhtml +++ b/app/views/file_request/index.rhtml @@ -1,7 +1,13 @@ -<h1>New request</h1> +<% @title = "New FOI request" %> + +<%= error_messages_for :info_request %> <% form_for(:info_request, @info_request, :url => { :action => :create }, :html => { :id => 'writeForm' } ) do |f| %> - <%= error_messages_for :info_request %> + + <h1>New FOI request</h1> + + <p>All information that you enter, except for your email address, will be +displayed publically on this website.</p> <% fields_for :user do |u| %> <p> @@ -18,7 +24,7 @@ <% end %> <p> - <label for="info_request_title">Title:</label> + <label for="info_request_title">Title:</label> <%= f.text_field :title, "size" => 50 %> <!-- (a one line summary of the information you are requesting, e.g. 'Crime statistics by ward level for Wales') --> </p> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 7eb81f3ec..137c4ac81 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -2,7 +2,7 @@ <html lang="en-gb"> <head> <!-- <script type="text/javascript" src="/js.js"></script> --> - <title>Freedom of Information Filer and Archive</title> + <title>Freedom of Information Filer and Archive <%= @title ? "-" : "" %> <%=@title%></title> <%= stylesheet_link_tag 'main' %> <!-- <link rel="alternate" type="application/rss+xml" title="" href=""> --> </head> @@ -19,7 +19,11 @@ <div id="error"><%= flash[:error] %></div> <% end %> + <div id="wrapper"> + <div id="content"> + <%= yield :layout %> + </div> + </div> - <%= yield :layout %> </body> </html> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 2ae80158a..4975fd75a 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -39,39 +39,17 @@ label { width: 5em; } -fieldset { - border: none; - padding: 0.5em; -} - -legend { - display: none; -} - -dt { - font-weight: bold; - margin-top: 0.5em; -} - -.v { display: none; } - -.a { - color: #000000; - background-color: #f3e5a5; -} - /* Flashes */ -#error, #notice { +#errorExplanation, #notice { text-align: center; font-size: larger; padding: 4px; margin: 1em; } -#error { - +#errorExplanation { color: #cc0000; - background-color: #ffeeee; + background-color: #ffcccc; border: solid 1px #cc0000; } #notice { @@ -148,16 +126,6 @@ dt { color: #97E300; } -#footer { - clear: both; - text-align: right; - font-size: 83%; - border-top: solid 1px #4e451b; - display: table; - margin: 2em 0 1em auto; - padding: 2px 4px; -} - /* Front page */ #explanation { @@ -166,6 +134,8 @@ dt { margin: 0 2em; } +/* Submitting requests */ + #writeForm { float: right; text-align: center; @@ -190,19 +160,9 @@ dt { /* Forms */ -fieldset div { - margin-top: 2px; - clear: left; -} -fieldset div.checkbox { - padding-left: 5.5em; -} -fieldset div.checkbox label, label.n { - float: none; - text-align: left; - padding-right: 0; - width: auto; - cursor: pointer; - cursor: hand; +.fieldWithErrors input, .fieldWithErrors input[type=text], .fieldWithErrors select, .fieldWithErrors input[type=radio]{ + border: solid 1px #cc0000; + background-color: #ffcccc; } + |