diff options
46 files changed, 566 insertions, 3 deletions
diff --git a/assets/images/hamburger.png b/assets/images/hamburger.png Binary files differnew file mode 100644 index 0000000..0c44f63 --- /dev/null +++ b/assets/images/hamburger.png diff --git a/assets/images/link-icon.png b/assets/images/link-icon.png Binary files differnew file mode 100644 index 0000000..7a6dd01 --- /dev/null +++ b/assets/images/link-icon.png diff --git a/assets/images/link-icon@2.png b/assets/images/link-icon@2.png Binary files differnew file mode 100644 index 0000000..eafb1e2 --- /dev/null +++ b/assets/images/link-icon@2.png diff --git a/assets/images/locale-switcher.png b/assets/images/locale-switcher.png Binary files differnew file mode 100644 index 0000000..850cb9a --- /dev/null +++ b/assets/images/locale-switcher.png diff --git a/assets/images/logo.png b/assets/images/logo.png Binary files differindex 8b88458..36f5f38 100644 --- a/assets/images/logo.png +++ b/assets/images/logo.png diff --git a/assets/images/navimg/logo-trans-small.png b/assets/images/navimg/logo-trans-small.png Binary files differnew file mode 100644 index 0000000..e9ad9ea --- /dev/null +++ b/assets/images/navimg/logo-trans-small.png diff --git a/assets/images/old-logo.png b/assets/images/old-logo.png Binary files differnew file mode 100644 index 0000000..8b88458 --- /dev/null +++ b/assets/images/old-logo.png diff --git a/assets/images/quote-marks.png b/assets/images/quote-marks.png Binary files differindex 752b7d4..e98f35c 100644 --- a/assets/images/quote-marks.png +++ b/assets/images/quote-marks.png diff --git a/assets/images/search.png b/assets/images/search.png Binary files differnew file mode 100644 index 0000000..ab38621 --- /dev/null +++ b/assets/images/search.png diff --git a/assets/images/small-green-cross.png b/assets/images/small-green-cross.png Binary files differnew file mode 100644 index 0000000..96ebac9 --- /dev/null +++ b/assets/images/small-green-cross.png diff --git a/assets/images/status/classification.png b/assets/images/status/classification.png Binary files differnew file mode 100644 index 0000000..32d8067 --- /dev/null +++ b/assets/images/status/classification.png diff --git a/assets/images/status/classification@2x.png b/assets/images/status/classification@2x.png Binary files differnew file mode 100644 index 0000000..f3991db --- /dev/null +++ b/assets/images/status/classification@2x.png diff --git a/assets/images/status/delayed.png b/assets/images/status/delayed.png Binary files differnew file mode 100644 index 0000000..515e42c --- /dev/null +++ b/assets/images/status/delayed.png diff --git a/assets/images/status/delayed@2x.png b/assets/images/status/delayed@2x.png Binary files differnew file mode 100644 index 0000000..d08d207 --- /dev/null +++ b/assets/images/status/delayed@2x.png diff --git a/assets/images/status/delivery_error.png b/assets/images/status/delivery_error.png Binary files differnew file mode 100644 index 0000000..a6d7280 --- /dev/null +++ b/assets/images/status/delivery_error.png diff --git a/assets/images/status/delivery_error@2x.png b/assets/images/status/delivery_error@2x.png Binary files differnew file mode 100644 index 0000000..8bb2400 --- /dev/null +++ b/assets/images/status/delivery_error@2x.png diff --git a/assets/images/status/locked.png b/assets/images/status/locked.png Binary files differnew file mode 100644 index 0000000..7201f26 --- /dev/null +++ b/assets/images/status/locked.png diff --git a/assets/images/status/locked@2x.png b/assets/images/status/locked@2x.png Binary files differnew file mode 100644 index 0000000..772fd2d --- /dev/null +++ b/assets/images/status/locked@2x.png diff --git a/assets/images/status/notheld.png b/assets/images/status/notheld.png Binary files differnew file mode 100644 index 0000000..5a41cfb --- /dev/null +++ b/assets/images/status/notheld.png diff --git a/assets/images/status/notheld@2x.png b/assets/images/status/notheld@2x.png Binary files differnew file mode 100644 index 0000000..d90b2fb --- /dev/null +++ b/assets/images/status/notheld@2x.png diff --git a/assets/images/status/overdue.png b/assets/images/status/overdue.png Binary files differnew file mode 100644 index 0000000..29bf083 --- /dev/null +++ b/assets/images/status/overdue.png diff --git a/assets/images/status/overdue@2x.png b/assets/images/status/overdue@2x.png Binary files differnew file mode 100644 index 0000000..fcaa662 --- /dev/null +++ b/assets/images/status/overdue@2x.png diff --git a/assets/images/status/partiallysuccessful.png b/assets/images/status/partiallysuccessful.png Binary files differnew file mode 100644 index 0000000..0368a2e --- /dev/null +++ b/assets/images/status/partiallysuccessful.png diff --git a/assets/images/status/partiallysuccessful@2x.png b/assets/images/status/partiallysuccessful@2x.png Binary files differnew file mode 100644 index 0000000..81688d9 --- /dev/null +++ b/assets/images/status/partiallysuccessful@2x.png diff --git a/assets/images/status/postal.png b/assets/images/status/postal.png Binary files differnew file mode 100644 index 0000000..589cd9b --- /dev/null +++ b/assets/images/status/postal.png diff --git a/assets/images/status/postal@2x.png b/assets/images/status/postal@2x.png Binary files differnew file mode 100644 index 0000000..e08aea5 --- /dev/null +++ b/assets/images/status/postal@2x.png diff --git a/assets/images/status/refused.png b/assets/images/status/refused.png Binary files differnew file mode 100644 index 0000000..a184e72 --- /dev/null +++ b/assets/images/status/refused.png diff --git a/assets/images/status/refused@2x.png b/assets/images/status/refused@2x.png Binary files differnew file mode 100644 index 0000000..7605335 --- /dev/null +++ b/assets/images/status/refused@2x.png diff --git a/assets/images/status/reported.png b/assets/images/status/reported.png Binary files differnew file mode 100644 index 0000000..f61b364 --- /dev/null +++ b/assets/images/status/reported.png diff --git a/assets/images/status/reported@2x.png b/assets/images/status/reported@2x.png Binary files differnew file mode 100644 index 0000000..0139ecd --- /dev/null +++ b/assets/images/status/reported@2x.png diff --git a/assets/images/status/review.png b/assets/images/status/review.png Binary files differnew file mode 100644 index 0000000..f1412b9 --- /dev/null +++ b/assets/images/status/review.png diff --git a/assets/images/status/review@2x.png b/assets/images/status/review@2x.png Binary files differnew file mode 100644 index 0000000..5013074 --- /dev/null +++ b/assets/images/status/review@2x.png diff --git a/assets/images/status/successful.png b/assets/images/status/successful.png Binary files differnew file mode 100644 index 0000000..042bea9 --- /dev/null +++ b/assets/images/status/successful.png diff --git a/assets/images/status/successful@2x.png b/assets/images/status/successful@2x.png Binary files differnew file mode 100644 index 0000000..b311012 --- /dev/null +++ b/assets/images/status/successful@2x.png diff --git a/assets/images/status/unusual.png b/assets/images/status/unusual.png Binary files differnew file mode 100644 index 0000000..abca813 --- /dev/null +++ b/assets/images/status/unusual.png diff --git a/assets/images/status/unusual@2x.png b/assets/images/status/unusual@2x.png Binary files differnew file mode 100644 index 0000000..2e47740 --- /dev/null +++ b/assets/images/status/unusual@2x.png diff --git a/assets/images/status/waiting.png b/assets/images/status/waiting.png Binary files differnew file mode 100644 index 0000000..7af9696 --- /dev/null +++ b/assets/images/status/waiting.png diff --git a/assets/images/status/waiting@2x.png b/assets/images/status/waiting@2x.png Binary files differnew file mode 100644 index 0000000..174fd7d --- /dev/null +++ b/assets/images/status/waiting@2x.png diff --git a/assets/images/status/withdrawn.png b/assets/images/status/withdrawn.png Binary files differnew file mode 100644 index 0000000..c629418 --- /dev/null +++ b/assets/images/status/withdrawn.png diff --git a/assets/images/status/withdrawn@2x.png b/assets/images/status/withdrawn@2x.png Binary files differnew file mode 100644 index 0000000..164056c --- /dev/null +++ b/assets/images/status/withdrawn@2x.png diff --git a/assets/images/wordpress.png b/assets/images/wordpress.png Binary files differnew file mode 100644 index 0000000..31955ac --- /dev/null +++ b/assets/images/wordpress.png diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss new file mode 100644 index 0000000..b771fd2 --- /dev/null +++ b/assets/stylesheets/responsive/custom.scss @@ -0,0 +1,557 @@ +$locale-bg: #333; +$locale-color: #999999; +$locale-hover-color: #fff; +$link-color: #336C86; +$body-font-color: #333; +$body-bg: #f7eee1; +$button-bg: #8b9352; +$button-color: #fff; +$heading-color: #3d3b38; +$font-family: "Roboto Slab", Georgia, serif; +$sans-serif-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + +$main_menu-bg: #2c5d74; +$main_menu-search_text: #333; +$main_menu-link_text: #fff; +$main_menu-search_bg: #67848c; +$banner_bg: #354c56; +$submenu-color: #9aa6ab; + +$main_menu-link_bg: #2c5d74; +$main_menu-active_link_text: $main_menu-link_bg; +$main_menu-active_link_bg: $body-bg; + +$footer-bg: #333; +$footer-color: #ccc; +$footer-link-color: #fff; + +$incoming-correspondence-color: #8c6673; +$outgoing-correspondence-color: #6d918d; +$correspondence-bg: #fff; +$correspondence-shadow: #d3d3d3; + +$status-success: #aab26e; +$status-failure: #ff7959; +$status-pending: #e69e5d; + +$notice-bg: #D7DABD; +$notice-border: #839310; + +$error-bg: #ebc3a9; +$error-border: #a1432c; + +$action-bg: #edd3b8; +$action-border: #d69457; + +/* Mixin styles */ + +/* Hide text when it's replaced by an image */ +.image-replacement { + overflow: hidden; + text-indent: 150%; + white-space: nowrap; +} + +/* General styling of nav menu items */ +.menu-item { + text-decoration: none; + background-color: $main_menu-link_bg; + color: transparentize($main_menu-link_text, 0.2); + @include ie8 { + color: $main_menu-link_text; + } + transition: background-color 0.5s ease-out; + + &:hover{ + background-color: darken($main_menu-bg, 5%); + color: transparentize($main_menu-link_text, 0); + } + +} + +/* Selected menu item */ +.selected-menu-item { + font-weight: bold; + color: $main_menu-active_link_text; + background-color: $main_menu-active_link_bg; + &:hover{ + background-color: $main_menu-active_link_bg; + } +} + +/* Styling if not part of the main menu on larger screens */ +.sub-menu-item { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-color: $banner_bg; + color: $submenu-color; + &:hover{ + background-color: $banner_bg; + color: transparentize($main_menu-link_text, 0); + } + } +} + +/* General styles */ +body{ + background-color: $body-bg; + color: $body-font-color; +} + +.entirebody { + font-family: $font-family; +} + +a{ + color: $link-color; +} + +h1, h2, h3, h4, h5, h6 { + color: $heading-color; + font-family: $font-family; +} + +/* Let h1s be a little smaller on small screens */ +@media( max-width: $main_menu-mobile_menu_cutoff ){ + h1 { + font-size: 2em; + } +} + +/* Square corners for text type inputs */ +form input[type="text"], +form input[type="password"], +form input[type="search"], +form input[type="email"], +form input[type="url"], +form input[type="tel"], +form input[type="number"] { + border-radius: 0; + background-color: $main_menu-link_text; + /* Set a fixed height for text inputs in older IE 8 */ + @include ie8{ + height: 2.3125em; + } + /* Do the same in px for IE < 7 */ + @include lte-ie7{ + height: 22px; + } +} + +input.use-datepicker[type=text] { + width: 130px; + background:image-url('calendar.png') no-repeat 100px 5px $main_menu-link_text; +} + +form input[type=submit], a.link_button_green, a.link_button_green_large { + text-decoration: none; + color: $button-color; + background-color: darken($button-bg, 5%); + display: inline-block; + cursor: pointer; + /* This style is expressed for all borders to avoid triggering an IE9 border rendering bug */ + border-style: solid; border-color: darken($button-bg, 15%); border-width: 0 0 4px 0; + border-radius: 0; + padding: 3px 7px; + line-height: normal; + font-size: 1.1rem; + /* Same height as form elements */ + height: 2.3125rem; + @include ie8 { + height: 2.3125em; + font-size: 1.1em; + } + vertical-align: top; + &:focus, &:hover{ + text-decoration: none; + background-color: darken($button-bg, 10%); + border-bottom: 4px solid darken($button-bg, 20%); + } +} + +@include lte-ie7{ + + a.link_button_green, a.link_button_green_large { + padding: 0 7px; + height: 31px; + font-weight: bold; + } + + form input[type=submit] { + padding: 0; + height: 35px; + } +} + +a.link_button_green_large { + font-size: 2.2rem; + height: inherit; + padding: 0 10px; + @include ie8 { + font-size: 2.2em; + height: 66px; + } + @include lte-ie7 { + height: 50px; + } +} + +/* Popups */ + +.popup { + background-color: $notice-bg; + border: 3px solid $notice-border; +} + + +/* Header */ + +#banner_inner { + background-color: $banner-bg; +} + +#topnav { + background-color: $main_menu-bg; +} + +#navigation{ + border-bottom: none; + a { + @extend .menu-item; + } + /* Show which section is currently selected */ + li.selected a{ + @extend .selected-menu-item; + } + + /* Vertically align the search box */ + #navigation_search{ + input{ + margin-top:0.313em; + margin-bottom:0.313em; + height: 1.875em; + @include ie8 { + height: 33px; + font-size: 1.1em; + padding: 0; + } + } + } + + /* Vertically align the label image for older IE*/ + @include ie8 { + img { + margin-top: 0.626em; + } + } + + #navigation_search_button{ + background-color: mix($main_menu-search_bg, $main_menu-bg, 50%); + border: none; + transition: all 0.3s ease-out; + color: $main_menu-search_text; + border-radius: 0; + font-size: inherit; + &:focus{ + background-color: $main_menu-link_text; + } + } +} + +.greeting { + color: $body-bg; +} +/* Notices, errors */ + +#notice, #error, .errorExplanation, #request_header_text, #hidden_request, .describe_state_form form, .undescribed_requests { + border-top: 10px solid; + font-size: 1.2em; + border-radius: 0; + margin:1em 0; + padding: 1.5em; + + p:first-child { + margin-top: 0; + } + + p:last-child { + margin-bottom:0; + } + + ul { + margin: 0; + } +} + +#notice, #request_header_text { + background-color: $notice-bg; + border-color: $notice-border; +} + +#error, .errorExplanation, #hidden_request { + background-color: $error-bg; + border-color: $error-border; + +} + +.undescribed_requests { + background-color: $action-bg; + border-color: $action-border; +} + +/* Logged and local options act like submenus */ +#logged_in_bar{ + a { + @extend .menu-item; + @extend .sub-menu-item; + font-weight: normal; + } + #logged_in_links { + top: 4em; + .greeting, a { + font-weight: normal; + } + } +} + +#user_locale_switcher { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-image: image-url('locale-switcher.png'); + background-repeat: no-repeat; + background-position: 0.5em 0.5em; + background-color: $locale-bg; + border-radius: 0 0 1.25em 1.25em; + padding: 0 1em 0 2.5em; + right: 15px; + } + a { + @extend .menu-item; + font-family: $sans-serif-font-family; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0.2em; + background-color: $locale-bg; + border-radius: 0 0 1.25em 1.25em; + color: $locale-color; + &:hover{ + background-color: $locale-bg; + color: $locale-hover-color; + } + } + } +} + + +#banner { + + /* locale border */ + @include respond-min( $main_menu-mobile_menu_cutoff ){ + border-top: 4px solid $locale-bg; + } + + /* Hide the greeting on smaller devices */ + .greeting { + display: none; + } + + .rsp_menu_button{ + position: absolute; + top: 0; + /* 15px for margin minus 9 for background offset*/ + right: 4px; + @extend .image-replacement; + background-image: image-url('hamburger.png'); + background-repeat: no-repeat; + background-position: center 10px; + background-size: 28px 26px; + width: 44px; + height: 38px; + padding: 0; + /* Make sure clickable area covers image */ + a { + width: 100%; + height: 100%; + } + } + + /* Pad evenly top and bottom on smaller devices */ + #logo_wrapper{ + + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include lte-ie7 { + padding-bottom: 2em; + } + } + @media(max-width: $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0 0.5em 0.9375em; + img { + height: 30px; + } + } + } + +} + + +/* Footer */ +#footer { + background-color: $footer-bg; + color: $footer-color; + padding: 2em 4em; + font-family: $sans-serif-font-family; + a { + text-decoration: none; + color: $footer-link-color; + } + ul > li:nth-child(4n+1) { + padding-top: 0; + } + + ul li { + padding: 1em 0 0 0 ; + text-align: bottom; + } +} + +/* Request page */ +div.correspondence { + background-color: $correspondence-bg; + padding-bottom: 0.5em; + .event_actions { + margin-bottom: 0; + } +} + +.incoming.correspondence { + border: none; + border-top: 8px solid $incoming-correspondence-color; + box-shadow: 0 3px 3px $correspondence-shadow; + font-family: "Courier New", Courier, monospace; + font-size: 0.9rem; + @include ie8 { + font-size: 0.9em; + } + a.link_to_this { + background-color: $incoming-correspondence-color; + } +} + +.outgoing.correspondence { + border: none; + border-top: 8px solid $outgoing-correspondence-color; + box-shadow: 0 3px 3px $correspondence-shadow; + a.link_to_this { + background-color: $outgoing-correspondence-color; + } +} + +.describe_state_form input[type="radio"] + label { + display:inline; +} + +a.link_to_this { + background-image: image-url('link-icon.png'); + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('link-icon@2.png'); + } + background-position: center center; + background-repeat: no-repeat; + background-size: 70% 70%; + border-radius: 50%; + height: 20px; + width: 20px; +} + +#link_box { + font-family: $font-family; + border-radius: 0; + border: 1px solid $heading-color; + .close-button { + background-color: $correspondence-bg; + float: right; + } +} + +.describe_state_form { + padding: 0; + + form{ + background-color: $action-bg; + border-color: $action-border; + h2 { + margin-top: 0; + } + hr { + border-color: $action-border; + } + } +} + +/* Status lines and icons */ +.icon_waiting_classification, +.icon_waiting_response, +.icon_waiting_clarification, +.icon_requires_admin, +.icon_waiting_response_overdue, +.icon_gone_postal, +.icon_error_message, +.icon_internal_review, +.icon_user_withdrawn { + color: $status-pending; +} + +.icon_attention_requested, +.icon_not_held, +.icon_waiting_response_very_overdue, +.icon_failed, +.icon_rejected { + color: $status-failure; +} + +.icon_successful, +.icon_partially_successful { + color: $status-success; +} + +/* Attachments*/ + +.view_html_prefix { + font-family: $font-family; + background-color: $banner-bg; + color: transparentize($main_menu-link_text, 0.2); + @include ie8 { + color: $main_menu-link_text; + } + a { + color: $main_menu-link_text; + } + .view_html_logo, .view_html_description { + padding-top: 1em; + } +} + +/* User page */ +#user_photo_on_profile { + img, #set_photo { + margin-top:0.5em; + } +} + +/* Help pages */ + +dt { + color: $heading-color; + font-weight: 700; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 2em; + line-height: 1.1em; + } +} + +/* Front page */ +/* Drop the extract indentation on small screens */ +#frontpage_examples .excerpt { + padding: 0.2em 0 0 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 0 0 0 2em; + } +} + diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb index 9f8f339..19a54a0 100644 --- a/lib/views/general/_before_head_end.html.erb +++ b/lib/views/general/_before_head_end.html.erb @@ -1 +1 @@ -<%= stylesheet_link_tag "application" %> + <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto+Slab:400,700&subset=latin,latin-ext,cyrillic,cyrillic-ext"> diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb index 2b91e73..b22d123 100644 --- a/lib/views/general/_orglink.html.erb +++ b/lib/views/general/_orglink.html.erb @@ -1 +1 @@ -<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> +<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %> diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index 7787d15..28e55fd 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -31,7 +31,7 @@ wrong, they ought to advise you who to make the request to instead. <dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt> <dd> -<p>Please <a href="/help/contact">contact us</a> with the name of the public authority and, +<p>Please <a href="<%= new_change_request_path %>">contact us</a> with the name of the public authority and, if you can find it, their contact email address for Freedom of Information requests. </p> <p>If you'd like to help add a whole category of public authority to the site, we'd love diff --git a/lib/views/outgoing_mailer/initial_request.text.erb b/lib/views/outgoing_mailer/initial_request.text.erb index f927ad2..f755e39 100644 --- a/lib/views/outgoing_mailer/initial_request.text.erb +++ b/lib/views/outgoing_mailer/initial_request.text.erb @@ -4,6 +4,12 @@ <%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %> +<%= _('Please use this email address for all replies to this request:')%> +<%= @info_request.incoming_email %> + +<%= _('Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:', :email_address => @info_request.public_body.request_email, :type_of_request => @info_request.law_used_full, :public_body_name => @info_request.public_body.name)%> +<%= new_change_request_url(:body => @info_request.public_body.url_name) %> + <%= render :partial => 'followup_footer' %> ------------------------------------------------------------------- |
