aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorangie <angie>2008-04-24 22:50:03 +0000
committerangie <angie>2008-04-24 22:50:03 +0000
commitab28b4652dd246f2ec59285f1521e896f2b6f2f7 (patch)
tree4a87ba7594310245b6889ab5281a5f4616265346
parent10dbed55e951113fca961785423c418272d7b747 (diff)
many design things
-rw-r--r--app/models/info_request_event.rb3
-rw-r--r--app/models/outgoing_message.rb11
-rw-r--r--app/views/body/_body_listing_single.rhtml15
-rw-r--r--app/views/body/show.rhtml3
-rw-r--r--app/views/request/_bubble.rhtml15
-rw-r--r--app/views/request/_request_listing_single.rhtml21
-rw-r--r--app/views/request/_request_listing_via_event.rhtml55
-rw-r--r--app/views/request/_sidebar_request_listing.rhtml18
-rw-r--r--app/views/request/new.rhtml133
-rw-r--r--app/views/request/show.rhtml110
-rw-r--r--config/environments/production.rb1
-rw-r--r--public/stylesheets/main.css1037
12 files changed, 643 insertions, 779 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 60253df3b..e8e1ecaa5 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -20,7 +20,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request_event.rb,v 1.38 2008-04-21 16:44:06 francis Exp $
+# $Id: info_request_event.rb,v 1.39 2008-04-24 22:50:03 angie Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
@@ -184,7 +184,6 @@ class InfoRequestEvent < ActiveRecord::Base
end
end
-
end
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 28aa0a754..189ff77d2 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: outgoing_message.rb,v 1.43 2008-04-21 16:44:06 francis Exp $
+# $Id: outgoing_message.rb,v 1.44 2008-04-24 22:50:03 angie Exp $
class OutgoingMessage < ActiveRecord::Base
belongs_to :info_request
@@ -133,9 +133,16 @@ class OutgoingMessage < ActiveRecord::Base
text = self.body
text = MySociety::Format.make_clickable(text, :contract => 1)
text = text.gsub(/\n/, '<br>')
-
return text
end
+
+ def get_body_for_neat_html_display
+ text = self.body
+ text = MySociety::Format.make_clickable(text, :contract => 1)
+ text = text.gsub(/\n\n/, '<br>')
+ return text
+ end
+
# Return body for display as HTML
# XXX this is repeating code in a combination of
diff --git a/app/views/body/_body_listing_single.rhtml b/app/views/body/_body_listing_single.rhtml
index c060ccdb3..dd0ab36c5 100644
--- a/app/views/body/_body_listing_single.rhtml
+++ b/app/views/body/_body_listing_single.rhtml
@@ -2,18 +2,19 @@
@highlight_words = []
end %>
-<p class="body_listing">
+<div class="body_listing">
+ <span class="head">
<%= link_to highlight_words(public_body.name, @highlight_words), public_body_url(public_body) %>
-
- <br>
+ </span>
+ <span class="desc">
<% if not public_body.short_name.empty? %>
Also called <%=highlight_words(public_body.short_name, @highlight_words) %>.
<br>
<% end %>
-
- <span class="body_listing_bottomline">
- <%= pluralize(public_body.info_requests.size, "request") %> made.
+ </span>
+ <span class="bottomline">
+ <%= pluralize(public_body.info_requests.size, "request") %> made. <br>
Added on <%= simple_date(public_body.created_at) %>.
</span>
-</p>
+</div>
diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml
index 5a972831b..66b8a8555 100644
--- a/app/views/body/show.rhtml
+++ b/app/views/body/show.rhtml
@@ -1,5 +1,4 @@
<% @title = "Information freed from '" + h(@public_body.name) + "'" %>
-
<h1><%=h(@public_body.name)%></h1>
<p class="subtitle">
@@ -21,5 +20,3 @@
<%= render :partial => 'request/request_listing', :locals => { :info_requests => @public_body.info_requests } %>
<% end %>
-
-
diff --git a/app/views/request/_bubble.rhtml b/app/views/request/_bubble.rhtml
index de3ee296f..f3f053522 100644
--- a/app/views/request/_bubble.rhtml
+++ b/app/views/request/_bubble.rhtml
@@ -1,8 +1,4 @@
-<blockquote class="xsnazzy">
- <div>
- <strong class="xb1"></strong><strong class="xb2"></strong><strong class="xb3"></strong><strong class="xb4"></strong><strong class="xb5"></strong><strong class="xb6"></strong><strong class="xb7"></strong>
- </div>
- <div class="xboxcontent">
+ <div class="correspondence_text">
<% if not attachments.nil? and attachments.size > 0 %>
<p> <% attachments.each do |a| %>
<% attachment_url = get_attachment_url(:id => incoming_message.info_request_id,
@@ -21,11 +17,4 @@
</p>
<% end %>
<p><%= body %></p>
- </div>
- <div>
- <strong class="xb7"></strong><strong class="xb6"></strong><strong class="xb5"></strong><strong class="xb4"></strong><strong class="xb3"></strong><strong class="xb2"></strong><strong class="xb1"></strong>
- <em></em>
- <span class="bubblebit"></span>
- </div>
-</blockquote>
-
+ </div> \ No newline at end of file
diff --git a/app/views/request/_request_listing_single.rhtml b/app/views/request/_request_listing_single.rhtml
index f50627a5f..0a060dece 100644
--- a/app/views/request/_request_listing_single.rhtml
+++ b/app/views/request/_request_listing_single.rhtml
@@ -1,18 +1,17 @@
-<p class="request_listing">
- <%= link_to h(info_request.title), request_url(info_request) %>
-
- <br>
- <%= excerpt(info_request.initial_request_text, "", 150) %>
- <br>
-
- <span class="request_listing_bottomline">
+<div class="request_listing">
+ <span class="head">
+ <%= link_to h(info_request.title), request_url(info_request) %>
+ </span>
+ <span class="desc">
+ <%= excerpt(info_request.initial_request_text, "", 150) %>
+ </span>
+ <span class="bottomline icon_<%= info_request.calculate_status %>">
<strong>
<%= info_request.display_status %>
- </strong>
-
+ </strong><br>
Requested from <%= public_body_link(info_request.public_body) %>
by <%= user_link(info_request.user) %>
on <%= simple_date(info_request.created_at) %>.
</span>
-</p>
+</div>
diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml
index 58630337b..8fe1d23ca 100644
--- a/app/views/request/_request_listing_via_event.rhtml
+++ b/app/views/request/_request_listing_via_event.rhtml
@@ -1,34 +1,34 @@
-<p class="request_listing">
+<div class="request_listing">
+ <span class="head">
+ <% if not @highlighting.nil? and @highlighting['InfoRequestEvent'][event.id].include?('title') %>
+ <%= link_to @highlighting['InfoRequestEvent'][event.id]["title"], request_url(info_request) %>
+ <% @highlighting['InfoRequestEvent'][event.id].delete("title") %>
+ <% elsif not event.incoming_message.nil? %>
+ <%= link_to "Response to '" + h(info_request.title) + "'", incoming_message_url(event.incoming_message) %>
+ <% elsif not event.outgoing_message.nil? and event.event_type == 'followup_sent' %>
+ <%= link_to "Follow up message for '" + h(info_request.title) + "'", outgoing_message_url(event.outgoing_message) %>
+ <% else %>
+ <%= link_to h(info_request.title), request_url(info_request) %>
+ <% end %>
+ </span>
+ <span class="desc">
+ <% if not @highlighting.nil? and @highlighting['InfoRequestEvent'][event.id].size > 0 %>
+ <%= @highlighting['InfoRequestEvent'][event.id].values.join(" ") %>
+ <% elsif not event.outgoing_message.nil? %>
+ <%= excerpt(event.outgoing_message.body_without_salutation, "", 150) %>
+ <% elsif not event.incoming_message.nil? %>
+ <%= excerpt(event.incoming_message.get_body_for_quoting, "", 150) %>
+ <% else %>
+ <%= excerpt(info_request.initial_request_text, "", 150) %>
+ <% end %>
+ </span>
- <% if not @highlighting.nil? and @highlighting['InfoRequestEvent'][event.id].include?('title') %>
- <%= link_to @highlighting['InfoRequestEvent'][event.id]["title"], request_url(info_request) %>
- <% @highlighting['InfoRequestEvent'][event.id].delete("title") %>
- <% elsif not event.incoming_message.nil? %>
- <%= link_to "Response to '" + h(info_request.title) + "'", incoming_message_url(event.incoming_message) %>
- <% elsif not event.outgoing_message.nil? and event.event_type == 'followup_sent' %>
- <%= link_to "Follow up message for '" + h(info_request.title) + "'", outgoing_message_url(event.outgoing_message) %>
- <% else %>
- <%= link_to h(info_request.title), request_url(info_request) %>
- <% end %>
-
- <br>
- <% if not @highlighting.nil? and @highlighting['InfoRequestEvent'][event.id].size > 0 %>
- <%= @highlighting['InfoRequestEvent'][event.id].values.join(" ") %>
- <% elsif not event.outgoing_message.nil? %>
- <%= excerpt(event.outgoing_message.body_without_salutation, "", 150) %>
- <% elsif not event.incoming_message.nil? %>
- <%= excerpt(event.incoming_message.get_body_for_quoting, "", 150) %>
- <% else %>
- <%= excerpt(info_request.initial_request_text, "", 150) %>
- <% end %>
- <br>
-
- <span class="request_listing_bottomline">
+ <span class="bottomline icon_<%= info_request.calculate_status %>">
<% if event.event_type == 'sent' %>
<strong>
<%= info_request.display_status %>
- </strong>
+ </strong><br>
Request sent to <%= public_body_link(info_request.public_body) %>
by <%= user_link(info_request.user) %>
<% elsif event.event_type == 'followup_sent' %>
@@ -45,8 +45,7 @@
<% else %>
<% raise "unknown event type indexed " + event.event_type %>
<% end %>
-
on <%= simple_date(event.created_at) %>.
</span>
-</p>
+</div>
diff --git a/app/views/request/_sidebar_request_listing.rhtml b/app/views/request/_sidebar_request_listing.rhtml
index 3da0b4972..e9aeb4f73 100644
--- a/app/views/request/_sidebar_request_listing.rhtml
+++ b/app/views/request/_sidebar_request_listing.rhtml
@@ -1,16 +1,16 @@
<% for info_request in info_requests %>
- <p class="request_listing">
- <%= request_link(info_request) %>
-
- <br>
+ <div class="request_listing">
+ <span class="head">
+ <%= request_link(info_request) %>
+ </span>
+ <span class="desc">
<%=h excerpt(info_request.initial_request_text, "", 100) %>
- <br>
-
- <span class="request_listing_bottomline">
+ </span>
+ <span class="bottomline">
<strong>
<%= info_request.display_status %>
- </strong>
+ </strong><br>
Requested on <%= simple_date(info_request.created_at) %>.
</span>
- </p>
+ </div>
<% end %>
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index 44bae85c9..1c64b9c8a 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -16,73 +16,74 @@
<% form_for(:info_request, @info_request, :html => { :id => 'write_form' } ) do |f| %>
<div id="request_advice">
- <h1>Read this before writing your Freedom of Information request</h1>
- <ul>
- <li>Use a <strong>search engine first</strong> to check that the information isn't already published.
- </li>
- <li>Write your request in <strong>simple, precise language</strong>.
- <% if @info_request.public_body.info_requests.size > 0 %>
- <li>Browse <%= link_to "other requests", public_body_url(@info_request.public_body) %>
- to '<%= h(@info_request.public_body.name) %>'
- for examples of how to word your request.
- </li>
- <% else %>
- <li>Browse <%= link_to "other requests", request_list_url %> for examples of how to word your request.
- </li>
- <% end %>
- <li>Keep it <strong>focussed</strong>, if you ask for everything it might cost too much
- and you might get nothing.
- </li>
- <li>Top tip: Ask for a <strong>particular document</strong> you have seen mentioned elsewhere.
- </li>
- <li>This site is <strong>public</strong>, everything you type (except your email address) and any response will be published.
- </li>
- </ul>
+ <h1>Read this before writing your Freedom of Information request</h1>
+ <ul>
+ <li>Use a <strong>search engine first</strong> to check that the information isn't already published.
+ </li>
+ <li>Write your request in <strong>simple, precise language</strong>.
+ <% if @info_request.public_body.info_requests.size > 0 %>
+ <li>Browse <%= link_to "other requests", public_body_url(@info_request.public_body) %>
+ to '<%= h(@info_request.public_body.name) %>'
+ for examples of how to word your request.
+ </li>
+ <% else %>
+ <li>Browse <%= link_to "other requests", request_list_url %> for examples of how to word your request.
+ </li>
+ <% end %>
+ <li>Keep it <strong>focussed</strong>, if you ask for everything it might cost too much
+ and you might get nothing.
+ </li>
+ <li>Top tip: Ask for a <strong>particular document</strong> you have seen mentioned elsewhere.
+ </li>
+ <li>This site is <strong>public</strong>, everything you type (except your email address) and any response will be published.
+ </li>
+ </ul>
</div>
-
- <p>
- <label class="form_label" for="info_request_public_body_id">To:</label>
- <span id="to_public_body"><%=h(@info_request.public_body.name)%></span>
- </p>
-
- <p>
- <label class="form_label" for="info_request_title">Summary:</label>
- <%= f.text_field :title, :size => 50 %>
- </p>
- <div class="form_item_note">
- (a one line summary of the information you are requesting,
- e.g. 'Crime statistics by ward level for Wales')
- </div>
-
- <% fields_for :outgoing_message do |o| %>
- <p>
- <label class="form_label" for="outgoing_message_body">Your request:</label>
- <%= o.text_area :body, :rows => 20, :cols => 60 %>
- </p>
- <% end %>
-
- <div class="form_button">
- <script type="text/javascript">document.write('<input name="doSpell" type="button" value="Check spelling" onClick="openSpellChecker(document.getElementById(\'write_form\').body);"/> (optional)')</script>
- </div>
-
- <p class="form_note">
- <strong>Privacy warning:</strong> All information that you enter, except
- for your email address, will be displayed publically on this website. Any
- response you get will also be published.
- </p>
-
- <p class="form_note">
- <strong>Can I request information about myself?</strong>
- <a href="/help/about#data_protection">No! (Click here for details)</a>
- </p>
-
- <div class="form_button">
- <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
- <%= hidden_field_tag(:submitted_new_request, 1 ) %>
- <%= hidden_field_tag(:preview, 1 ) %>
- <%= submit_tag "Preview your public request" %>
- </div>
-
+
+ <div id="request_form">
+ <h1>
+ <label class="form_label" for="info_request_public_body_id">To:</label>
+ <span id="to_public_body"><%=h(@info_request.public_body.name)%></span>
+ </h1>
+
+ <p>
+ <label class="form_label" for="info_request_title">Summary:</label>
+ <%= f.text_field :title, :size => 50 %>
+ </p>
+ <div class="form_item_note">
+ (a one line summary of the information you are requesting,
+ e.g. 'Crime statistics by ward level for Wales')
+ </div>
+
+ <% fields_for :outgoing_message do |o| %>
+ <p>
+ <label class="form_label" for="outgoing_message_body">Your request:</label>
+ <%= o.text_area :body, :rows => 20, :cols => 60 %>
+ </p>
+ <% end %>
+
+ <div class="form_button">
+ <script type="text/javascript">document.write('<input name="doSpell" type="button" value="Check spelling" onClick="openSpellChecker(document.getElementById(\'write_form\').body);"/> (optional)')</script>
+ </div>
+
+ <p class="form_note">
+ <strong>Privacy warning:</strong> All information that you enter, except
+ for your email address, will be displayed publically on this website. Any
+ response you get will also be published.
+ </p>
+
+ <p class="form_note">
+ <strong>Can I request information about myself?</strong>
+ <a href="/help/about#data_protection">No! (Click here for details)</a>
+ </p>
+
+ <div class="form_button">
+ <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %>
+ <%= hidden_field_tag(:submitted_new_request, 1 ) %>
+ <%= hidden_field_tag(:preview, 1 ) %>
+ <%= submit_tag "Preview your public request" %>
+ </div>
+ </div>
<% end %>
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index a8970a242..ae9f2bda2 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -6,6 +6,62 @@
</div>
<% end %>
+<div id="request_sidebar">
+ <h2>People tracking this request</h2>
+ <% if @info_request.track_things.size > 0 %>
+ <ul>
+ <% for track_thing in @info_request.track_things %>
+ <li><%=user_link(track_thing.tracking_user)%></li>
+ <% end %>
+ </ul>
+ <p>
+ <% if @existing_track %>
+ You are already tracking this request
+ (<%= link_to "alter your subscriptions", user_url(@user) %>).
+ <% else %>
+ <% if @info_request.user == @user %>
+ <p>You will be emailed when there are updates to your own request.</p>
+ <p>You may also <%= link_to "get an RSS feed", track_request_url(:url_title => @info_request.url_title) %>
+ <img src="/images/feed-14.png" alt="" class="rss"></p>
+ <% else %>
+ <%= link_to "Track updates to this request", track_request_url(:url_title => @info_request.url_title) %>
+ (by email or RSS feed <img src="/images/feed-14.png" alt="" class="rss">)
+ <% end %>
+ <% end %>
+ </p>
+ <% else %>
+ <% if @info_request.user == @user %>
+ <p>You will be emailed when there are updates to your own request.</p>
+ <p>You may also get an <%= link_to 'RSS feed', track_request_url(:url_title => @info_request.url_title) %>
+ <img src="/images/feed-14.png" alt="" class="rss"></p>
+ <% else %>
+ <p>Be the first to <%= link_to "track updates to this request", track_request_url(:url_title => @info_request.url_title) %>
+ (by email or RSS feed <img src="/images/feed-14.png" alt="" class="rss">)</p>
+ <% end %>
+ <% end %>
+
+ <h2>Act on this request</h2>
+ <p>
+ <img src="/images/writetothem.png" alt=""> <a href="http://www.writetothem.com">Write to your politician</a> about it
+ <br><img src="/images/pledgebank.png" alt=""> <a href="http://www.pledgebank.com">Pledge with others</a>
+ </p>
+
+ <% if @info_requests_same_user_same_body.size > 0 %>
+ <h2>Requests from same user to same authority</h2>
+ <!-- <h2>Some other requests made by <%= user_link(@info_request.user) %> to <%= public_body_link(@info_request.public_body) %></h2> -->
+ <%= render :partial => 'sidebar_request_listing', :locals => { :info_requests => @info_requests_same_user_same_body } %>
+ <% if @info_requests_same_user_same_body_more %>
+ <p><%= link_to "More such requests", search_url(:query => "variety:sent requested_from:" + @info_request.public_body.url_name + " requested_by:" + @info_request.user.url_name + " -request:" + @info_request.url_title, :sortby => "newest") %></p>
+ <% end %>
+ <% end %>
+
+ <!--<h2>Blog posts about this request</h2>
+ <p>...
+ <h2>Wikipedia articles</h2>
+ <p>...-->
+</div>
+
+
<div id="request_main">
<h1><%=@title%></h1>
@@ -65,60 +121,6 @@
<% end %>
</div>
-<div id="request_sidebar">
- <h2>People tracking this request</h2>
- <% if @info_request.track_things.size > 0 %>
- <ul>
- <% for track_thing in @info_request.track_things %>
- <li><%=user_link(track_thing.tracking_user)%></li>
- <% end %>
- </ul>
- <p>
- <% if @existing_track %>
- You are already tracking this request
- (<%= link_to "alter your subscriptions", user_url(@user) %>).
- <% else %>
- <% if @info_request.user == @user %>
- <p>You will be emailed when there are updates to your own request.</p>
- <p>You may also <%= link_to "get an RSS feed", track_request_url(:url_title => @info_request.url_title) %>
- <img src="/images/feed-14.png" alt="" class="rss"></p>
- <% else %>
- <%= link_to "Track updates to this request", track_request_url(:url_title => @info_request.url_title) %>
- (by email or RSS feed <img src="/images/feed-14.png" alt="" class="rss">)
- <% end %>
- <% end %>
- </p>
- <% else %>
- <% if @info_request.user == @user %>
- <p>You will be emailed when there are updates to your own request.</p>
- <p>You may also get an <%= link_to 'RSS feed', track_request_url(:url_title => @info_request.url_title) %>
- <img src="/images/feed-14.png" alt="" class="rss"></p>
- <% else %>
- <p>Be the first to <%= link_to "track updates to this request", track_request_url(:url_title => @info_request.url_title) %>
- (by email or RSS feed <img src="/images/feed-14.png" alt="" class="rss">)</p>
- <% end %>
- <% end %>
-
- <h2>Act on this request</h2>
- <p>
- <img src="/images/writetothem.png" alt=""> <a href="http://www.writetothem.com">Write to your politician</a> about it
- <br><img src="/images/pledgebank.png" alt=""> <a href="http://www.pledgebank.com">Pledge with others</a>
- </p>
-
- <% if @info_requests_same_user_same_body.size > 0 %>
- <h2>Requests from same user to same authority</h2>
- <!-- <h2>Some other requests made by <%= user_link(@info_request.user) %> to <%= public_body_link(@info_request.public_body) %></h2> -->
- <%= render :partial => 'sidebar_request_listing', :locals => { :info_requests => @info_requests_same_user_same_body } %>
- <% if @info_requests_same_user_same_body_more %>
- <p><%= link_to "More such requests", search_url(:query => "variety:sent requested_from:" + @info_request.public_body.url_name + " requested_by:" + @info_request.user.url_name + " -request:" + @info_request.url_title, :sortby => "newest") %></p>
- <% end %>
- <% end %>
-
- <!--<h2>Blog posts about this request</h2>
- <p>...
- <h2>Wikipedia articles</h2>
- <p>...-->
-</div>
<% if @info_request.awaiting_description %>
<div class="describe_state_form">
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 22cd429cf..84a8f5965 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,4 +17,3 @@ config.action_controller.perform_caching = true
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors
-
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index d0d2e1b67..33fc09705 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -1,626 +1,497 @@
-/* Generics */
-
-body {
- font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, sans-serif;
- margin: 0;
- padding: 0;
-}
-
-h1 {
- font-size: 175%;
-}
-h2 {
- font-size: 140%;
-}
-
-a:link {
- color: #0000ff;
-}
-a:visited {
- color: #551a8b;
-}
-a:active {
- color: #ff0000;
-}
-
-#error_technical_details {
- font-size: 70%;
- margin-top: 2em;
-}
-
-.subtitle {
- font-style: italic;
- margin-top: -1em;
-}
-
-/* Site-wide layout */
-
-#staging {
- text-align: center;
- border-bottom: solid 1px #000000;
- background: #ffbbbb;
-}
-
-#header {
- border-bottom: solid 1px #79b837;
- margin: 0;
- padding: 5px 0.5em;
- background-color: #c7eb6e;
- /* Richard: 006aa2, c35b00, 613000 */
- /* Richard: 151517, a72d22, c3d42c */
- /* Tom: how about block heading c7eb6e , heading edge 79b837 and title text 0a0a0a */
- color: #000000;
-}
-
-#header h1 {
- font-size: 200%;
- font-weight: bold;
- margin: 0;
-}
-
-#tagline {
- /* color: #6e653b; */
-
- color: #0a0a0a;
- background-color: #c7eb6e;
- padding-top: -2em;
- font-size: 100%;
- font-style: italic;
-}
-
-#header a:link, #header a:visited {
- color: #0a0a0a;
- background-color: #c7eb6e;
- text-decoration: none;
-}
-#header a:active, #header a:hover {
- text-decoration: underline;
-}
-
-#beta, #beta a:link, #beta a:visited {
- color: #6e653b;
- background-color: #c7eb6e;
- font-size: 70%;
-}
-
-#content {
- width: 100%; /* Must specify a width or IE goes crazy wrong! */
- position: relative;
- margin: 0 auto;
- max-width: 60em;
-}
-
-/* Can't put the margin in #content because of above IE craziness */
-#wrapper {
- margin: 2em;
- margin-left: 4em;
- margin-right: 4em;
-}
-
-#navigation {
- position: absolute;
- top: 2em;
- right: 1em;
- padding: 0;
- margin: 0;
- list-style-type: none;
-}
-#navigation li {
- display: inline;
- padding: 0;
- margin: 0;
-}
-
-#navigation a {
- display: -moz-inline-box;
- display: inline-block;
- padding: 0.5em 1em;
-}
-#navigation a:link, #navigation a:visited {
- color: #000000;
-}
-#navigation a:hover, #navigation a:active {
- background-color: #79b837;
- color: #c7eb6e;
-}
-#navigation_search {
- position: absolute;
- top: -0.5em;
- right: 2em;
-}
-
-#logged_in_bar {
- text-align: right;
- margin-top: 0.5em;
- margin-right: 2em;
- margin-left: 1em;
-}
-
-#footer {
- padding: 3px;
- border-top: solid 1px #79b837;
- font-size: 90%;
- text-align: center;
- width: 75%;
- margin: 1em auto 0;
- clear: both;
-}
-/* Forms */
-
-form {
- margin: 0;
-}
-
-.plaque {
- background-color: #c7eb6e;
- -moz-border-radius: 1em;
- border-radius: 1em;
- padding: 1em;
-}
-
-select, input, textarea {
- font-size: 99%;
-}
-
-.form_label {
- clear: both;
- float: left;
- text-align: right;
- padding-right: 0.5em;
- margin-bottom: 0.5em;
- font-weight: bold;
-}
-.form_label {
- width: 16em;
-}
-.form_note {
- margin-left: 16.5em;
-}
-.form_button {
- margin-left: 16em;
-}
-.form_item_note {
- margin-left: 16.5em;
- margin-top: -0.85em;
- font-style: italic;
-}
-
-/* Flashes */
-
-#errorExplanation, #error, #notice {
- text-align: center;
- font-size: 120%;
- padding: 0.5em;
- margin: 1em;
-}
-#errorExplanation, #error {
- color: #cc0000;
- background-color: #ffcccc;
- border: solid 1px #cc0000;
-}
-#notice {
- color: #00cc00;
- background-color: #eeffee;
- border: solid 1px #00cc00;
-}
-
-/* Form error highlighting */
-
-.fieldWithErrors input, .fieldWithErrors input[type=text],
-.fieldWithErrors select, .fieldWithErrors input[type=radio],
-.fieldWithErrors input[type=password],
-.fieldWithErrors textarea
+/*------------------------------------------------ global */
+body
{
- border: solid 1px #cc0000;
- background-color: #ffcccc;
-}
-div.fieldWithErrors { display:inline; }
-
-/* / - front page */
-
-#alpha_notice {
- font-size: 120%;
- color: #000000;
- background-color: #eeeeee;
- border: solid 1px #000000;
-}
-#alpha_notice p {
- text-align: center;
-}
-#alpha_notice ol {
- margin-left: 18%;
- width: 64%;
-}
-
-#general_frontpage h1 {
- margin-bottom: 1em;
-}
-#general_frontpage #make_requests {
- text-align: center;
- width: 45%;
- float: left;
- margin-bottom: 1em;
-}
-#general_frontpage #public_body_form {
+ padding: 0px;
+ margin: 0px;
+ text-align: center;
+ font-family: Tahoma, Geneva, sans-serif;
}
-#general_frontpage #find_information {
- width: 45%;
- float: right;
- margin-bottom: 1em;
- text-align: center;
-}
-#general_frontpage .request_listing {
- text-align: left;
-}
-
-#public_body_search ul {
- padding: 1em 0 1em 0;
- border: solid 1px #79b837;
- list-style-type: none;
- background-color: #ffffff;
-}
-#public_body_search li {
- background-color: #ffffff;
-}
-.public_body_search_note {
- font-style: italic;
- text-align: center;
-}
+/*------------------------------------------------ banner */
-/* from auto_complete plugin */
-div.auto_complete {
- width: 350px;
- background: #fff;
- cursor: default;
-}
-div.auto_complete ul {
- border:1px solid #888;
- margin:0;
- padding:0;
- width:100%;
- list-style-type:none;
-}
-div.auto_complete ul li {
- margin:0;
- padding:3px;
-}
-div.auto_complete ul li.selected {
- background-color: #ffb;
-}
-div.auto_complete ul strong.highlight {
- color: #800;
- margin:0;
- padding:0;
+#banner
+{
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 100%;
+ margin: 0px;
+ background-color: #F0F0F0;
+ border-color: #993233;
+ border-width: 0 0 3px 0;
+ border-style: solid;
+ height: 100px;
+ background-image: url(../images/navimg/bnnr-temp-100pxa.jpg);
+ background-repeat: no-repeat;
+ background-position: center top;
+
+}
+
+/*------------------------------------------------ header; not needed? */
+#header
+{
+ height: 55px;
+ position: absolute;
+ top: 4px;
+ left: 14px;
+ height: 55px;
+ width: 300px;
+}
+ #header h1
+ {
+ font-size: 0.01em;
+ }
+
+ #header h1 a
+ {
+ color: #f0f0f0;
+ display: block;
+ height: 55px;
+ background-image: url(../images/navimg/logo-trans.png);
+ background-repeat: no-repeat;
+ }
+ #header #beta a
+ {
+ background-image: none;
+ /*../images/navimg/*/
+ }
+ #header #tagline { display: none; }
+/*------------------------------------------------ search */
+
+#navigation_search
+{
+ position: absolute;
+ width: 100%;
+ left: 0px;
+ top: 70px;
+ z-index: 150;
+ text-align: right;
+ -moz-opacity: 0.7!important;
+ filter: alpha(opacity= 70)!important;
+ opacity: 0.7!important;
+}
+ #navigation_search input
+ {
+ border-color: #010101;
+ border-width: 1px;
+ border-style: solid;
+ background-color: #fff;
+ color: #000;
+ }
+ #navigation_search input#navigation_search_query
+ {
+ width: 8em;
+ }
+
+#navigation_search p { margin: 0 0.6em 0 0; }
+
+/*------------------------------------------------ topnav */
+#topnav
+{
+ position: relative;
+ top: 103px;
+ left: 0px;
+ width: 100%;
+ height: auto;
+ overflow: auto;
+ padding: 0px 0px 0px 0px;
+ z-index: 100;
+ background-color: #000;
+ font-size: 0.9em;
+}
+
+ #topnav ul
+ {
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+ }
+
+ #topnav li
+ {
+ float: left;
+ }
+
+ #topnav li a, #topnav li a:visited
+ {
+ display: block;
+ margin: 0px;
+ padding: 0.15em 0.6em 0.25em 0.8em;
+ color: #ADADAD;
+ text-decoration: none;
+ }
+
+ #topnav li a:hover
+ { color: #fff; }
+
+ #topnav li a:active { }
+
+ #topnav li a.on, #topnav li a.on:visited
+ {
+ font-weight: bold;
+ color: #000;
+ }
+
+ #topnav li a.on:hover {}
+
+ #topnav li a.on:active {}
+
+/*-------------------------- login/signup */
+#logged_in_bar
+{
+ float: right;
+ clear: none;
+ font-size: 0.9em;
+ z-index: 200;
+ padding: 0.20em 10px 0.25em 1em;
+ color: #FFF;
}
+ #logged_in_bar a, #logged_in_bar a:visited { color: #92B3FF; }
+/*------------------------------------------------ temp stuff */
+#staging, #alpha_notice, #beta
+{ display: none;}
-
-/* /new - submitting requests */
-
-#write_form {
- float: center;
- margin-bottom: 1em;
+#staging
+{
+ border-color: #FF201D;
+ border-width: 1px;
+ border-style: dotted;
+ clear: both;
+ text-align: center;
+ color: #FF201D;
+ margin-top: 40px;
}
-#write_form #address_part {
- float: right;
- width: 50%;
+#alpha_notice
+{
+ padding: 0 20px 0 20px;
+ border-color: #FF201D;
+ border-width: 1px;
+ border-style: dotted;
+ background-color: #f0f0f0;
}
-#write_form #message_part {
- float: right;
-}
+/*------------------------------------------------ wrapper*/
-#request_advice {
- margin-left: 12em;
+#wrapper
+{
+ position: relative;
+ clear: both;
+ top: 105px;
+ padding: 0px;
+ margin: 0px auto 1.2em auto;
+ max-width: 50em;
+ /* = 800px at default size? so 1em = 16px*/
+ _width: 50em;
+ text-align: left;
+ border-color: #FF0B16;
}
-#to_public_body {
- font-size: 140%;
- font-weight: bold;
-}
+/*------------------------------------------------ content */
-#preview_form {
- float: center;
- margin-left: 8em;
+#content
+{
+ position: relative;
+ padding: 2em 1em 1em 1em;
}
-#preview_form .outgoing_message_preview {
- width: 75%;
- background-color: #c7eb6e;
- border: solid 1px #79b837;
- padding: 1em;
+h1, h2, h3
+{
+ font-family: Trebuchet, Trebuchet MS, Helvetica, sans-serif;
+ /*Arial Black, Gadget, sans-serif*/
+ font-weight: bold;
+ line-height: 1em;
+ letter-spacing: 0em;
+ color: #555;
}
+ h1 { font-size: 1.8em;}
+ h2 { font-size: 1.4em;}
+ h3 { font-size: 1em;}
+h4, h5, h6
+{}
-/* /list - browsing requests */
-table#list_requests {
- border-collapse: collapse;
- border: solid 1px #79b837;
- border-width: 1px 0 1px 1px;
-}
-table#list_requests td, table#list_requests th {
- margin: 0; padding: 0.2em;
- border: solid 1px #79b837;
-}
-table#list_requests .odd {
- background-color: #dddddd;
-}
-.request_listing {
-}
-.request_listing_bottomline {
- color: #7aa600;
-}
-.request_listing_bottomline a:link {
- color: #7777cc;
-}
-.request_listing_bottomline a:visited {
- color: #551a8b;
-}
-.request_listing_bottomline a:active {
- color: #ff0000;
+/*---------------- content : recent requests sidebar */
+#find_information
+{
+ width: 18em;
+ float: right;
+ clear: none;
+ background-color: #e0e0e0;
+ background-image: url(../images/navimg/sidebag-bg-wide2.png);
+ background-repeat: no-repeat;
+ background-position: center top;
+ padding: 105px 0.25em 0.25em 0.35em;
+}
+ #find_information h1
+ { font-size: 1.2em; line-height: 0.9em; margin-top: 0px; }
+
+ #find_information p
+ { font-size: 0.8em; line-height: 1.1em; }
+
+ #find_information input#query
+ { width: 12em; }
+
+/*------ content : recent requests sidebar, overriding full-list bits */
+#find_information .request_listing
+{
+ margin-top: 0;
+ clear: none;
+ padding: 0 0 0 0;
+ border: none;
+}
+
+ #find_information span.head { margin: 0 0 0em 0px; }
+
+ #find_information span.bottomline
+ {
+ width: 22em;
+ background-image: none;
+ padding: 0em 0em 0em 0em;
+ }
+
+ #find_information span.desc
+ {
+ float: none; background-image: none; padding: 0em 0em 0em 0em;
+ }
+
+
+/*--------------------------------- content : full lists */
+
+.request_listing,
+.body_listing
+{
+ font-size: 0.8em;
+ margin-top: 1.5em;
+ border-bottom: #9C9C9C;
+ border-width: 0 0 1px 0;
+ border-style: none none solid none;
+ overflow: hidden;
+}
+ .request_listing
+ {
+ padding: 0 0 1em 0;
+ }
+ .body_listing
+ {
+ padding: 0 0 0em 0;
+ }
+
+ .request_listing a,
+ .body_listing a
+ { text-decoration: none; }
+
+ span.head
+ {
+ display: block;
+ font-size: 1.4em;
+ margin: 0 0 0.8em 0;
+ }
+
+ span.bottomline
+ {
+ display: block;
+ width: 30em;
+ padding: 10px 0 0 42px;
+ margin: 0 0 0.6em 0;
+ background-repeat: no-repeat;
+ background-position: left center;
+ min-height: 42px;
+ }
+ /* Waiting */
+ span.bottomline.icon_waiting_response,
+ span.bottomline.icon_waiting_response_overdue,
+ span.bottomline.icon_waiting_classification,
+ span.bottomline.icon_waiting_clarification
+ { background-image: url(../images/navimg/status-icons-wait.png);}
+ /* Failed */
+ span.bottomline.icon_not_held,
+ span.bottomline.icon_rejected
+ { background-image: url(../images/navimg/status-icons-fail.png);}
+ /* successful */
+ span.bottomline.icon_successful,
+ span.bottomline.icon_partially_successful
+ { background-image: url(../images/navimg/status-icons-succeed.png);}
+ /* Alert */
+ span.bottomline.icon_requires_admin { background-image: url(../images/navimg/status-icons-attn.png);}
+
+.body_listing .bottomline
+{ padding: 0px 0 0 0px; margin: 0 0 0em 0; clear: both;}
+
+ span.bottomline a
+ {}
+
+ span.desc
+ {
+ display: block;
+ width: 23em;
+ float: right;
+ clear: none;
+ font-style: italic;
+ color: #3F3F3F;
+ overflow: hidden;
+ background-image: url(../images/navimg/quote-open.png);
+ background-repeat: no-repeat;
+ background-position: 0 0;
+ padding: 8px 0 0 25px;
+ }
+ .body_listing span.desc
+ { background-image: none; float: left; clear: both; padding: 0px 0 0 0px;}
+
+/*---------------- content : lists back/next */
+
+div.pagination { text-align: center; padding-top: 0.3em;}
+
+ div.pagination span.current
+ {
+ padding: 0 0.6em 0.1em 0.6em;
+ background-color: #000;
+ color: #FFF;
+ }
+ span.disabled { color: #B2B2B2; padding: 0 0.6em 0.1em 0.6em; }
+ div.pagination a, div.pagination a:visited
+ {
+ text-decoration: none;
+ padding: 0 0.6em 0.1em 0.6em;
+ }
+ div.pagination a:hover
+ {
+ background-color: #626262;
+ color: #FFF;
+ }
+
+
+/*---------------- content : find authority (home page) */
+#make_requests
+{
+ float: left;
+ clear: none;
+ width: 26em;
+ text-align: center;
}
-/* /search - searching */
-
-.highlight {
- background-color: #dddd00;
- color: #000000;
+.auto_complete
+{
+ text-align: left;
+ background-color: #FFF;
+ border-color: #454545 #282828 #000 #454545;
+ border-width: 1px 1px 2px 1px;
+ border-style: solid;
+}
+
+ .auto_complete ul
+ {
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+ }
+ .auto_complete ul li
+ {
+ margin: 0px 0px 0.4em 0px;
+ padding: 0.1em 1em 0.3em 1em;
+ }
+ .auto_complete ul li:hover { color: #fff; background-color: #000; }
+
+
+/*---------------- content : request detail pages */
+
+#request_sidebar
+{
+ float: right;
+ clear: none;
+ width: 12em;
+ margin: 0 0 0 1em;
+ font-size: 0.85em;
}
-.user_listing {
-}
-.user_listing_bottomline {
- color: #7aa600;
-}
-.user_listing_bottomline a:link {
- color: #7777cc;
-}
-.user_listing_bottomline a:visited {
- color: #551a8b;
-}
-.user_listing_bottomline a:active {
- color: #ff0000;
+div.correspondence
+{
+ width: 34em;
+ float: left;
+ padding: 0.4em 1em 0.4em 1em;
+ margin: 0 0 1em 0;
+ border-color: #5F5F5F;
+ border-width: 1px;
+ border-style: solid;
}
-.status_table {
- border-collapse: collapse;
- border: solid 1px #000000;
-}
-.status_table td {
- border: solid 1px #000000;
-}
+/* id starts with... */
+div[id|=outgoing] { }
+div[id|=incoming] { background-color: #E7E7E7; font-family: Times New Roman, Times, serif;}
-/* /body - listing bodies */
+.correspondence_text { margin: 0 2em 0 2em; }
-.body_listing {
-}
-.body_listing_bottomline {
- color: #7aa600;
-}
-.body_listing_bottomline a:link {
- color: #7777cc;
-}
-.body_listing_bottomline a:visited {
- color: #551a8b;
-}
-.body_listing_bottomline a:active {
- color: #ff0000;
-}
+.event_bubble { margin: 3em 0 0 0; font-size: 0.9em;}
+/*------------------------------------------------ authority listings */
#body_sidebar {
- float: right;
- width: 20em;
- border: solid 1px #c7eb6e;
- margin: 0em 0 3em 3em;
-}
-#body_sidebar h1 {
- font-size: 120%;
- padding: 2px;
- margin: 0;
- color: #000000;
- background-color: #c7eb6e;
-}
-#body_sidebar p {
- margin: 1em;
-}
-
-
-/* /request - viewing requests */
-
-#request_main {
- float: left;
- width: 70%;
- margin-bottom: 2em;
-}
-
-#request_sidebar {
- float: right;
- width: 25%;
-}
-
-#request_status {
-}
-
-.quoted_email {
- display: none;
-}
-
-.correspondence h2 {
- margin-left: 1em;
- margin-top: 2em;
- margin-bottom: -0.5em;
-}
-
-.correspondence .subject {
- margin-left: 1em;
- margin-top: 1em;
- margin-bottom: -1.0em;
-}
-
-
-/* /describe_state - user setting status of request */
-
-.describe_state_form {
- clear: both;
- background-color: #eeffee;
- border: solid 1px #00cc00;
- padding: 1em;
-}
-
-/* /show_response - viewing individual responses */
-
-#show_response_sidebar {
- float: right;
- width: 30%;
-}
-
-#show_response_view {
- float: left;
- width: 70%;
- margin-bottom: 2em;
-}
-#show_response_followup {
- margin-top: 3em;
-}
-
-img.attachment_image {
- vertical-align: middle;
-}
-
-/* / - about page */
-
-dt {
- font-weight: bold;
- margin-top: 0.5em;
-}
-
-#about_sidebar {
- float: right;
- width: 15em;
- border: solid 1px #c7eb6e;
- margin: 3em 0 3em 3em;
-}
-#about_sidebar h1 {
- font-size: 120%;
- padding: 2px;
- margin: 0;
- color: #000000;
- background-color: #c7eb6e;
-}
-#about_sidebar p {
- margin: 1em;
-}
-
-#hash_link_padding {
- margin-bottom: 30em;
-}
-
-/* tracking */
-
-img.rss {
- vertical-align: baseline;
- border: 0;
-}
-
-
-/* User accounts */
-
-.confirmation_message {
- font-size: 150%;
- font-weight: bold;
- text-align: center;
-}
-.confirmation_heading {
- text-align: center;
-}
-
-#sign_together #signin {
- width: 48%;
- float: left;
- margin-bottom: 1em;
-}
-
-#sign_together #signup {
- width: 48%;
- float: right;
- margin-bottom: 1em;
-}
-
-#sign_alone {
- margin-left: 15%;
- margin-right: 15%;
-}
-
-#sign_together .form_label {
- width: 8em;
-}
-#sign_together .form_note {
- margin-left: 8.5em;
-}
-#sign_together .form_button {
- margin-left: 8em;
-}
-#sign_together .form_item_note {
- margin-left: 8.5em;
-}
-
-#sign_in_reason, #bad_token {
- font-weight: bold;
- text-align: center;
- font-size: 125%;
+ font-size: 0.85em;
+ width: 16em;
+ float: right;
+ clear:none;
}
+#body_sidebar a { text-decoration: none; }
-/* Speech bubbles
- * from http://www.cssplay.co.uk/boxes/chunky.html */
-.xsnazzy p {margin:0 10px; letter-spacing:1px;}
-.xsnazzy p {padding-bottom:0.5em; color:#eee;}
-.xsnazzy {background: transparent; margin:1.3em 0.5em 0.7em 0.5em;}
+/*------------------------------------------------ making a request */
-.xsnazzy em {display:block; width:0; height:0; color:#d8d8ee; overflow:hidden; border-top:12px solid #fff; border-left:12px dotted transparent; border-right:12px dotted transparent; margin-left:50px;}
+#request_advice
+{}
+ #request_advice ul
+ {
+ width: 26em;
+ margin: 0 auto 0 auto;
+ }
+ #request_advice ul li { margin: 0 0 1em 0; }
-/* hack for IE5.5 */
-* html .xsnazzy em {width:24px; height:12px; w\idth:0; hei\ght:0;}
+#request_form
+{ margin-top: 4em;}
-.xsnazzy span.bubblebit {display:block; width:0; height:0; color:#fff; overflow:hidden; border-top:10px solid #6f6f6f; border-left:10px dotted transparent; border-right:10px dotted transparent; margin-left:52px; margin-top:-15px;}
-* html .xsnazzy span.bubblebit {width:20px; height:10px; w\idth:0; hei\ght:0;}
-
-.xb1, .xb2, .xb3, .xb4, .xb5, .xb6, .xb7 {display:block; overflow:hidden; font-size:0;}
-.xb1, .xb2, .xb3, .xb4, .xb5, .xb6 {height:1px;}
-.xb4, .xb5, .xb6, .xb7 {background:#ccc; border-left:1px solid #fff; border-right:1px solid #fff;}
-.xb1 {margin:0 8px; background:#fff;}
-.xb2 {margin:0 6px; background:#fff;}
-.xb3 {margin:0 4px; background:#fff;}
-.xb4 {margin:0 3px; background:#6f6f6f; border-width:0 5px;}
-.xb5 {margin:0 2px; background:#6f6f6f; border-width:0 4px;}
-.xb6 {margin:0 2px; background:#6f6f6f; border-width:0 3px;}
-.xb7 {margin:0 1px; background:#6f6f6f; border-width:0 3px; height:2px;}
-
-.xboxcontent {display:block; background:#6f6f6f; border:3px solid #fff; border-width:0 3px;}
-.xboxcontent img { border: 0 }
-
-.xsnazzy a:link {
- color: #0000aa;
+#request_form label
+{
+ display: block;
+ width: 8em;
+ float: left;
+ clear: none;
+ text-align: right;
+ padding: 0 0.6em 0 0;
+}
+ #request_form h1 label
+ {
+ font-size: 0.55em;
+ }
+
+.form_item_note
+{
+ font-size: 0.8em;
+ width: 30em;
+ margin-left: 10.5em;
}
-.xsnazzy a:visited {
- color: #551a8b;
+.form_note
+{
+ font-size: 0.9em;
+ width: 30em;
+ margin-left: 10em;
}
-.unfold_link a:link {
- color: #ffffff;
-}
-.unfold_link a:visited {
- color: #bbbbbb;
+#request_form .form_button
+{
+ margin-left: 9em;
}
+/*------------------------------------------------ footer */
-.event_bubble {
- margin: -0.5em 1.5em 0em;
-}
-.event_plain {
- margin-left: 1.5em;
+#footer
+{
+ clear: both;
+ position: relative;
+ top: 110px;
+ background-color: #F0F0F0;
+ border-color: #993233;
+ border-width: 3px 0 0 0;
+ border-style: solid;
+ margin: 0 0 0 0;
+ padding: 0.5em 0 0.5em 0;
+ font-size: 0.85em;
}
-
-