diff --git a/app/assets/stylesheets/frontend/helpers/_page-header.scss b/app/assets/stylesheets/frontend/helpers/_page-header.scss index 840c3a04..d8be72ba 100644 --- a/app/assets/stylesheets/frontend/helpers/_page-header.scss +++ b/app/assets/stylesheets/frontend/helpers/_page-header.scss @@ -2,6 +2,7 @@ margin-top: 0; background-repeat: no-repeat; background-position: 0 8px; + margin-bottom: 10px; h1 { @include ig-core-48; diff --git a/app/assets/stylesheets/frontend/views/_common.scss b/app/assets/stylesheets/frontend/views/_common.scss index 24033b54..5feb7da9 100644 --- a/app/assets/stylesheets/frontend/views/_common.scss +++ b/app/assets/stylesheets/frontend/views/_common.scss @@ -140,4 +140,4 @@ input[type="email"] { } } } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/frontend/views/_details.scss b/app/assets/stylesheets/frontend/views/_details.scss index 28085ed2..14dff481 100644 --- a/app/assets/stylesheets/frontend/views/_details.scss +++ b/app/assets/stylesheets/frontend/views/_details.scss @@ -1,6 +1,15 @@ .details-page { + #header { + margin-top: $gutter; + padding-bottom: $gutter-one-third; + margin-bottom: $gutter-one-third; + } .page-header { - margin-bottom: $gutter; + + .type { + @include core-27; + color: #6e777b; + } @media (max-width: 800px) { margin-bottom: 0; @@ -21,7 +30,7 @@ .block-container { border-bottom: 1px solid $grey-2; - padding-bottom: $gutter-one-third; + padding-bottom: $gutter; margin: 0 $gutter; margin-bottom: $gutter-one-third; @@ -46,9 +55,15 @@ } } + h2 { + @include core-36; + font-weight: 700; + margin-bottom: $gutter; + } + h3 { - @include ig-core-24; - font-weight: bold; + @include core-24; + font-weight: 700; @media (max-width: 640px) { padding-top: 0; @@ -143,13 +158,11 @@ } li { - float: left; - width: $one-third; - @media (max-width: 640px) { float: none; width: $full-width; - margin-bottom: $gutter-two-thirds; + padding-top: 5px; + padding-bottom: 5px; } a, @@ -158,8 +171,8 @@ } a { - @include ig-core-24; - font-weight: bold; + @include ig-core-16; + font-weight: 700; } } } @@ -195,18 +208,18 @@ .online-contact { @include core-19; - font-weight: bold; li { margin-bottom: 5px; } + + } .phone-list { .tel { float: left; width: $one-third; - padding-bottom: $gutter; @media (max-width: 640px) { float: none; @@ -284,8 +297,14 @@ } } - .phone-number { - margin-bottom: $gutter*2; + .phone-number, .email { + margin-bottom: $gutter*1.5; + + h4 { + @include core-19; + font-weight: 700; + margin-bottom: 0.5em; + } &:last-child { margin-bottom: 0; @@ -301,7 +320,7 @@ } .note { - margin-top: $gutter; + margin-top: 0.5em; } } @@ -313,8 +332,7 @@ } .adr { - margin-top: $gutter-half; - margin-bottom: $gutter*2; + margin-bottom: $gutter*1.5; } &:last-child .adr, diff --git a/app/views/admin/contacts/_form.html.erb b/app/views/admin/contacts/_form.html.erb index 72ab4c19..1a656e89 100644 --- a/app/views/admin/contacts/_form.html.erb +++ b/app/views/admin/contacts/_form.html.erb @@ -21,7 +21,6 @@ <%= f.input :quick_link_1, label: false, placeholder: "Link", input_html: { class: "span4" } %> - <%= f.input :quick_link_description_1, label: false, placeholder: "Description", input_html: { rows: 5, class: "span9" }, hint: formatting_help_link %>
<%= f.label :quick_link_title_2, "Link 2", class: "control-label" %> @@ -30,7 +29,6 @@
<%= f.input :quick_link_2, label: false, placeholder: "Link", input_html: { class: "span4" } %> - <%= f.input :quick_link_description_2, label: false, placeholder: "Description", input_html: { rows: 5, class: "span9" }, hint: formatting_help_link %>
<%= f.label :quick_link_title_3, "Link 3", class: "control-label" %> @@ -39,13 +37,6 @@
<%= f.input :quick_link_3, label: false, placeholder: "Link", input_html: { class: "span4" } %> - <%= f.input :quick_link_description_3, label: false, placeholder: "Description", input_html: { rows: 5, class: "span9" }, hint: formatting_help_link %> - - -
- Online Transaction - <%= f.input :online_transaction_link, label: "Link", input_html: { class: "span4" } %> - <%= f.input :online_transaction_description, label: "Description", input_html: { rows: 5, class: "span9" }, hint: formatting_help_link %>
diff --git a/app/views/contact_form_links/_contact_form_link.html.erb b/app/views/contact_form_links/_contact_form_link.html.erb index 1483e845..4509bf24 100644 --- a/app/views/contact_form_links/_contact_form_link.html.erb +++ b/app/views/contact_form_links/_contact_form_link.html.erb @@ -1,4 +1,3 @@
  • - <%= link_to contact_form_link.title, contact_form_link.link, rel: 'external', class:'url fn' %> - <%= govspeak contact_form_link.description %> + <%= link_to contact_form_link.description, contact_form_link.link, rel: 'external', class:'url fn link-underline' %>
    • diff --git a/app/views/contacts/_contact_offline_details.html.erb b/app/views/contacts/_contact_offline_details.html.erb index 6fe4f7fb..0106970b 100644 --- a/app/views/contacts/_contact_offline_details.html.erb +++ b/app/views/contacts/_contact_offline_details.html.erb @@ -1,48 +1,32 @@ -<% if contact.phone_numbers.any? or contact.post_addresses.any? %> -
    +<% if contact.phone_numbers.any? %> +

    - Offline + Phone

    -
    -
    - <% if contact.phone_numbers.any? %> -
    -

    - Phone -

    - -
    - <% if contact.more_info_phone_number.present? %> - <%= govspeak contact.more_info_phone_number.to_s %> -
    - <% end%> - - <%= render contact.phone_numbers %> -
    -
    - <% end %> - <% if contact.post_addresses.any? %> -
    -

    - Post -

    - - <% if contact.more_info_post_address.present? %> -
    - <%= govspeak contact.more_info_post_address.to_s %> -
    -
    - <% end%> +
    + <%= render contact.phone_numbers %> +
    +
    +<% end %> - <%= render contact.post_addresses %> -
    - <% end %> +<% if contact.post_addresses.any? %> +
    +
    +
    +

    + Post +

    +
    + <%= render contact.post_addresses %> +
    +
    -<% end %> \ No newline at end of file +<% end %> + diff --git a/app/views/contacts/_contact_online_details.html.erb b/app/views/contacts/_contact_online_details.html.erb index f0399728..66e6ee6d 100644 --- a/app/views/contacts/_contact_online_details.html.erb +++ b/app/views/contacts/_contact_online_details.html.erb @@ -1,47 +1,39 @@ <% if contact.contact_form_links.any? or contact.email_addresses.any? %> -
    -
    -
    -

    - Online -

    -
    -
    -
    -
    - <% if contact.contact_form_links.any? %> -
    - <% if contact.email_addresses.any? %> -

    - Useful links -

    - <% end %> -
    - <%= govspeak contact.more_info_contact_form.to_s %> - -
      - <%= render contact.contact_form_links %> -
    -
    -
    - <% end %> - <% if contact.email_addresses.any? %> -
    - <% if contact.email_addresses.any? %> -

    - Email -

    - <% end %> - + <% if contact.contact_form_links.any? %> +
    +

    + Online Forms +

    + +
    +
    +
    +
      + <%= render contact.contact_form_links %> +
    + <%= govspeak contact.more_info_contact_form.to_s %>
    - <% end %> +
    +
    +
    + <% end -%> + <% if contact.email_addresses.any? %> +
    +
    +
    +

    + Email +

    +
    +
    +
    +
    -
    -<% end %> \ No newline at end of file + <% end %> +<% end %> diff --git a/app/views/contacts/_contact_top_details.html.erb b/app/views/contacts/_contact_top_details.html.erb index c8185854..6cb72c1f 100644 --- a/app/views/contacts/_contact_top_details.html.erb +++ b/app/views/contacts/_contact_top_details.html.erb @@ -1,36 +1,4 @@
    -
      - <% if contact.quick_link_title_1.present? && contact.quick_link_1.present? %> -
    • - <%= link_to contact.quick_link_title_1, contact.quick_link_1 %> - <% if contact.quick_link_description_1.present? %> -

      - <%= contact.quick_link_description_1 %> -

      - <% end -%> -
      • - <% end %> - <% if contact.quick_link_title_2.present? && contact.quick_link_2.present? %> -
    • - <%= link_to contact.quick_link_title_2, contact.quick_link_2 %> - <% if contact.quick_link_description_2.present? %> -

      - <%= contact.quick_link_description_2 %> -

      - <% end -%> -
      • - <% end %> - <% if contact.quick_link_title_3.present? && contact.quick_link_3.present? %> -
    • - <%= link_to contact.quick_link_title_3, contact.quick_link_3 %> - <% if contact.quick_link_description_3.present? %> -

      - <%= contact.quick_link_description_3 %> -

      - <% end -%> -
      • - <% end %> -
    diff --git a/app/views/contacts/show.html.erb b/app/views/contacts/show.html.erb index 0657e59e..2710ef22 100644 --- a/app/views/contacts/show.html.erb +++ b/app/views/contacts/show.html.erb @@ -1,28 +1,59 @@ <% page_class 'details-page' %> -
    -
    -

    - <%= contact %> contact details -

    + +
    + <% if (contact.quick_link_title_1.present? && contact.quick_link_1.present?) || + (contact.quick_link_title_2.present? && contact.quick_link_2.present?) || + (contact.quick_link_title_3.present? && contact.quick_link_3.present?) %> -<% if contact.query_response_time? %> -
    -
    -

    - <%= link_to "When can I expect a response to my query?", "http://www.hmrc.gov.uk/tools/progress-tool/index.htm" %> -

    -
    -
    -<% end -%> +
    +
    +
      + <% if contact.quick_link_title_1.present? && contact.quick_link_1.present? %> +
    • + <%= link_to contact.quick_link_title_1, contact.quick_link_1 %> +
      • + <% end %> + <% if contact.quick_link_title_2.present? && contact.quick_link_2.present? %> +
    • + <%= link_to contact.quick_link_title_2, contact.quick_link_2 %> +
      • + <% end %> + <% if contact.quick_link_title_3.present? && contact.quick_link_3.present? %> +
    • + <%= link_to contact.quick_link_title_3, contact.quick_link_3 %> +
      • + <% end %> +
    +
    +
    + <% end -%> -<%= render "contact_top_details" %> +
    +
    -<%= render "contact_online_transaction" %> +
    <%= render "contact_online_details" %> <%= render "contact_offline_details" %> + +<% if contact.query_response_time? %> +
    +
    +

    + <%= link_to "Find out", "http://www.hmrc.gov.uk/tools/progress-tool/index.htm" %> when to expect a response to your query +

    +
    +
    + +<% end -%> diff --git a/app/views/email_addresses/_email_address.html.erb b/app/views/email_addresses/_email_address.html.erb index 8663f9b7..7cbc3a2d 100644 --- a/app/views/email_addresses/_email_address.html.erb +++ b/app/views/email_addresses/_email_address.html.erb @@ -1,14 +1,13 @@
  • -

    - +

    +

    <%= email_address.title %> - -
    +

    <%= mail_to email_address.email %> -

    +
    • diff --git a/app/views/phone_numbers/_phone_number.html.erb b/app/views/phone_numbers/_phone_number.html.erb index f82ee094..d5561c7c 100644 --- a/app/views/phone_numbers/_phone_number.html.erb +++ b/app/views/phone_numbers/_phone_number.html.erb @@ -1,4 +1,10 @@
    + <%- if phone_number.contact.phone_numbers.size > 1 %> +

    + <%= phone_number.title %> +

    + <% end -%> +
    • Telephone: diff --git a/db/migrate/20140310155822_remove_quick_link_desc_and_transaction_from_contacts.rb b/db/migrate/20140310155822_remove_quick_link_desc_and_transaction_from_contacts.rb new file mode 100644 index 00000000..6839986c --- /dev/null +++ b/db/migrate/20140310155822_remove_quick_link_desc_and_transaction_from_contacts.rb @@ -0,0 +1,9 @@ +class RemoveQuickLinkDescAndTransactionFromContacts < ActiveRecord::Migration + def change + remove_column :contacts, :quick_link_description_1 + remove_column :contacts, :quick_link_description_2 + remove_column :contacts, :quick_link_description_3 + remove_column :contacts, :online_transaction_link + remove_column :contacts, :online_transaction_description + end +end diff --git a/db/schema.rb b/db/schema.rb index 1d70d739..e63b659a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140306160232) do +ActiveRecord::Schema.define(version: 20140310155822) do create_table "contact_groups", force: true do |t| t.integer "contact_group_type_id" @@ -40,11 +40,11 @@ t.text "description" t.datetime "created_at" t.datetime "updated_at" - t.integer "contact_form_links_count", default: 0 - t.integer "phone_numbers_count", default: 0 - t.integer "email_addresses_count", default: 0 - t.integer "post_addresses_count", default: 0 - t.integer "related_content_links_count", default: 0 + t.integer "contact_form_links_count", default: 0 + t.integer "phone_numbers_count", default: 0 + t.integer "email_addresses_count", default: 0 + t.integer "post_addresses_count", default: 0 + t.integer "related_content_links_count", default: 0 t.text "contact_information" t.text "more_info_contact_form" t.text "more_info_email_address" @@ -54,8 +54,6 @@ t.string "title" t.string "department_id" t.text "before_you_contact_us" - t.text "online_transaction_description" - t.string "online_transaction_link" t.string "quick_link_1" t.string "quick_link_title_1" t.string "quick_link_2" @@ -63,11 +61,8 @@ t.string "quick_link_3" t.string "quick_link_title_3" t.integer "need_id" - t.boolean "query_response_time", default: false - t.integer "popularity", default: 0 - t.string "quick_link_description_1" - t.string "quick_link_description_2" - t.string "quick_link_description_3" + t.boolean "query_response_time", default: false + t.integer "popularity", default: 0 end add_index "contacts", ["department_id"], name: "index_contacts_on_department_id", using: :btree