diff options
-rw-r--r-- | app/views/general/search.rhtml | 2 | ||||
-rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
-rw-r--r-- | app/views/request/new.rhtml | 4 | ||||
-rw-r--r-- | app/views/user/_signin.rhtml | 4 | ||||
-rw-r--r-- | app/views/user/_signup.rhtml | 2 | ||||
-rw-r--r-- | app/views/user/sign.rhtml | 21 | ||||
-rw-r--r-- | public/images/button-gradient.png | bin | 0 -> 329 bytes | |||
-rw-r--r-- | public/images/status-error.png | bin | 0 -> 788 bytes | |||
-rw-r--r-- | public/images/status-gone-postal.png | bin | 0 -> 882 bytes | |||
-rw-r--r-- | public/images/status-internal-review.png | bin | 0 -> 965 bytes | |||
-rw-r--r-- | public/images/status-not-held.png | bin | 0 -> 917 bytes | |||
-rw-r--r-- | public/images/status-withdrawn.png | bin | 0 -> 891 bytes | |||
-rw-r--r-- | public/stylesheets/theme.css | 153 |
13 files changed, 158 insertions, 30 deletions
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index cc522b367..18d398c08 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -16,7 +16,7 @@ <% if @bodies %> <%= hidden_field_tag 'bodies', 1 %> <% end %> - <%= image_submit_tag 'button-search.png', :title=>"Search" %> + <%= submit_tag _("Search") %> <% if not @show_tips %> <%= link_to _('Advanced search tips'), search_redirect_path %> <% end %> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index cfdf37935..6215d7a0c 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -49,7 +49,7 @@ <% else %> Make a new <strong>Freedom of Information</strong> request <% end %> - <%= _('<a href="{{url}}">{{image_tag}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :image_tag=>image_tag('start-button.png'))%> + <%= _(' <a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%> <% elsif @public_body.has_notes? %> <%= @public_body.notes_as_html %> <% elsif @public_body.not_requestable_reason == 'not_apply' %> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 867f5c2f9..ddb9bd046 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -30,7 +30,7 @@ <br> <%= text_field_tag 'q', params[:q], { :size => 20 } %> <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> - <%= submit_tag _("Search") %> + <%= submit_tag _("Search"), :class=>"small" %> <% end %> <br> ... <%= _('to check that the info isn\'t already published.') %> @@ -136,7 +136,7 @@ <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> <%= hidden_field_tag(:submitted_new_request, 1 ) %> <%= hidden_field_tag(:preview, 1 ) %> - <%= image_submit_tag "button-preview.png", :title=>"Preview your public request" %> + <%= submit_tag _("Preview your public request") %> </div> <% if !@info_request.tag_string.empty? %> diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 79628b3a9..6baed3c25 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -3,9 +3,9 @@ <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %> <%= foi_error_messages_for :user_signin %> - <% if not sign_in_as_existing_user %> + <!--<% if not sign_in_as_existing_user %> <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2> - <% end %> + <% end %>--> <p> <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 6b0a1f8c7..9c228d684 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -3,7 +3,7 @@ <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %> <%= foi_error_messages_for :user_signup %> - <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2> + <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>--> <p> <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml index b76edbc64..1140d961a 100644 --- a/app/views/user/sign.rhtml +++ b/app/views/user/sign.rhtml @@ -21,17 +21,26 @@ <div id="sign_together"> - <p id="sign_in_reason"> + <!--<p id="sign_in_reason"> <% if @post_redirect.reason_params[:web].empty? %> <%= _(' Please sign in or make a new account.') %> <% else %> <%= @post_redirect.reason_params[:web] %>, <%= _('please sign in or make a new account.') %> <% end %> - </p> - - <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> - <%= render :partial => 'signup' %> - + </p>--> + + <div id="left_half"> + <h1>Sign in</h1> + <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> + </div> + <div id="middle_strip"> + - or - + </div> + <div id="right_half"> + <h1>Sign up</h2> + <%= render :partial => 'signup' %> + </div> + <div style="clear:both"></div> </div> <% end %> diff --git a/public/images/button-gradient.png b/public/images/button-gradient.png Binary files differnew file mode 100644 index 000000000..8b29e89ba --- /dev/null +++ b/public/images/button-gradient.png diff --git a/public/images/status-error.png b/public/images/status-error.png Binary files differnew file mode 100644 index 000000000..5865dd1e1 --- /dev/null +++ b/public/images/status-error.png diff --git a/public/images/status-gone-postal.png b/public/images/status-gone-postal.png Binary files differnew file mode 100644 index 000000000..00df771ac --- /dev/null +++ b/public/images/status-gone-postal.png diff --git a/public/images/status-internal-review.png b/public/images/status-internal-review.png Binary files differnew file mode 100644 index 000000000..639f72797 --- /dev/null +++ b/public/images/status-internal-review.png diff --git a/public/images/status-not-held.png b/public/images/status-not-held.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/public/images/status-not-held.png diff --git a/public/images/status-withdrawn.png b/public/images/status-withdrawn.png Binary files differnew file mode 100644 index 000000000..d56aa213f --- /dev/null +++ b/public/images/status-withdrawn.png diff --git a/public/stylesheets/theme.css b/public/stylesheets/theme.css index e4c889118..93fa7b49b 100644 --- a/public/stylesheets/theme.css +++ b/public/stylesheets/theme.css @@ -1,7 +1,7 @@ h1 { color: #93278F; font-size: 42px; - font-family: DeliciousBold, Arial, sans-serif; + font-family: 'DeliciousBold', Arial, sans-serif; margin-bottom:0px; } @@ -16,13 +16,13 @@ h2 a:hover { h2, dt { color: #93278F; font-size: 21px; - font-family: DeliciousBold; + font-family: 'DeliciousBold', Arial, sans-serif; font-weight:normal; } h3 { color: #6B3C6A; - font-family: DeliciousRoman; + font-family: 'DeliciousRoman', Arial, sans-serif; font-weight: normal; text-decoration: none; font-size: 20px; @@ -124,7 +124,7 @@ div.lang { background: transparent; top: 120px; left: 115px; - font-family:DeliciousRoman; + font-family:'DeliciousRoman', Arial, sans-serif; font-size: 18px; } @@ -169,12 +169,12 @@ div.lang { border: 1px solid #DEBEDD; border-radius:5px; -moz-border-radius:5px; - font-family:DeliciousRoman; + font-family:'DeliciousRoman', Arial, sans-serif; color: #6B3C6A; font-size:18px; - padding:15px 12px; + padding:10px 12px; text-align:left; - width: 408px; + width: 412px; margin-bottom:40px; } @@ -228,7 +228,7 @@ p.subtitle { .user_listing span.head a, .body_listing span.head a { color: #6B3C6A; - font-family: DeliciousRoman; + font-family: 'DeliciousRoman', Arial, sans-serif; font-weight: normal; text-decoration: none; font-size: 20px; @@ -278,20 +278,55 @@ p.subtitle { padding-bottom:0px; } +.icon_requires_admin, +.icon_waiting_response_overdue, .icon_waiting_response_very_overdue { background-image: url(/images/status-overdue.png); color: #C1272D; } -.icon_complete { +.icon_successful, +.icon_partially_successful { background-image: url(/images/status-complete.png); + color: #69952F; } -.icon_waiting_classification { +.icon_waiting_classification, +.icon_waiting_clarification { background-image: url(/images/status-pending.png); color: #A68C2E; } +.icon_failed { + background-image: url(/images/status-denied.png); + color: #C1272D; +} + +.icon_not_held { + background-image: url(/images/status-not-held.png); + color: #A68C2E; +} + +.icon_gone_postal { + background-image: url(/images/status-gone-postal.png); + color: #A68C2E; +} + +.icon_error_message { + background-image: url(/images/status-error.png); + color: #C1272D; +} + +.icon_internal_review { + background-image: url(/images/status-internal-review.png); + color: #A68C2E; +} + +.icon_user_withdrawn { + background-image: url(/images/status-withdrawn.png); + color: #A68C2E; +} + #request_sidebar { width: 212px; font-size: 12px; @@ -334,12 +369,12 @@ p.subtitle { border-color: #BBB; border-width: 1px; width: 250px; - height: 19px; + height: 18px; + margin-right:-6px; } -#search_form input[type=image] { - margin-left: -5px; - margin-bottom: -10px; +#search_form input[type=submit] { + border-radius: 0px 2px 2px 0px; } #header_left { @@ -431,7 +466,7 @@ h2.publicbody_results { #request_form label, label.form_label { width: 100px; - font-family: DeliciousRoman; + font-family: 'DeliciousRoman', Arial, sans-serif; } #request_form label, @@ -442,7 +477,7 @@ span#to_public_body { } span#to_public_body { - font-family: DeliciousBold; + font-family: 'DeliciousBold', Arial, sans-serif; } .form_item_note, .form_note { @@ -460,6 +495,90 @@ span#to_public_body { margin-top:30px; } +#left_half { + width:45%; + float:left; +} + +#right_half { + width:45%; + float:right; +} + +#middle_strip { + float: left; + width: 10%; + height: 100px; + text-align: center; + margin-top: 45px; + font-size: 16px; + font-family: Georgia; + font-style: italic; + color: #93278F; +} + +#signup, #signin { + float:none; + margin-top:20px; + width:auto; +} + +#sign_together h1 { + width: 320px; + text-align: center; +} + +#sign_together .form_button { + margin-left: 10.5em; +} + +#signup .form_item_note, #signin .form_note { + margin-left:11.5em; + width:24em; +} + +#request_form label, label.form_label { + margin-top:2px; + text-align:left; +} + +form input[type=text], +form input[type=password] { + font-size: 14px; + padding: 4px 5px; + width:200px; +} + +form input[type=submit], +a.link_button_green { + background: url(/images/button-gradient.png); + color: white; + text-decoration: none; + padding: 5px 11px; + display: inline-block; + line-height: 18px; + border: solid 1px #69952F; + border-radius: 2px; + text-shadow: 1px 1px 0px #5B841D; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-size: 18px; + cursor: pointer; +} + +@-moz-document url-prefix() { + form input[type=submit], + a.link_button_green { + padding: 2px 11px; + margin-top:1px; + } +} + +form input[type=submit].small { + font-size: 15px; + padding: 4px 9px; + line-height: 10px; +} + ul.no_bullets { list-style-type:none; margin:0px 0px 30px 0px; @@ -499,7 +618,7 @@ div.frontpage-box { border: 1px solid #DEBEDD; border-radius:5px; -moz-border-radius:5px; - font-family:DeliciousRoman; + font-family:'DeliciousRoman', Arial, sans-serif; color: #6B3C6A; font-size:18px; padding:15px 12px 0; |