-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #93 from alphagov/contact-show-redesign
Redesign of contact show page and related changes
- Loading branch information
Showing
13 changed files
with
169 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,4 +140,4 @@ input[type="email"] { | |
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| <li class="vcard"> | ||
| <%= 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' %> | ||
| </li> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,32 @@ | ||
| <% if contact.phone_numbers.any? or contact.post_addresses.any? %> | ||
| <div class="block-container block-contact clearfix block-container-last"> | ||
| <% if contact.phone_numbers.any? %> | ||
| <div class="block-container block-contact clearfix <% if contact.post_addresses.empty? then 'block-container-last' end %>"> | ||
| <div class="block-1"> | ||
| <div class="inner-block"> | ||
| <h3> | ||
| Offline | ||
| Phone | ||
| </h3> | ||
| </div> | ||
| </div> | ||
| <div class="block-2"> | ||
| <div class="inner-block"> | ||
| <% if contact.phone_numbers.any? %> | ||
| <div class="block-container clearfix <%= 'block-container-last' if contact.post_addresses.none? %>"> | ||
| <h3> | ||
| Phone | ||
| </h3> | ||
|
|
||
| <div class="contact"> | ||
| <% if contact.more_info_phone_number.present? %> | ||
| <%= govspeak contact.more_info_phone_number.to_s %> | ||
| <br> | ||
| <% end%> | ||
|
|
||
| <%= render contact.phone_numbers %> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <% if contact.post_addresses.any? %> | ||
| <div class="block-container clearfix block-container-last"> | ||
| <h3> | ||
| Post | ||
| </h3> | ||
|
|
||
| <% if contact.more_info_post_address.present? %> | ||
| <div class="contact"> | ||
| <%= govspeak contact.more_info_post_address.to_s %> | ||
| <br> | ||
| </div> | ||
| <% end%> | ||
| <div class="block-2"> | ||
| <%= render contact.phone_numbers %> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <%= render contact.post_addresses %> | ||
| </div> | ||
| <% end %> | ||
| <% if contact.post_addresses.any? %> | ||
| <div class="block-container block-contact clearfix <%= if contact.query_response_time == false then 'block-container-last' end %>"> | ||
| <div class="block-1"> | ||
| <div class="inner-block"> | ||
| <h3> | ||
| Post | ||
| </h3> | ||
| </div> | ||
| </div> | ||
| <div class="block-2"> | ||
| <%= render contact.post_addresses %> | ||
| </div> | ||
|
|
||
| </div> | ||
| <% end %> | ||
| <% end %> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,39 @@ | ||
| <% if contact.contact_form_links.any? or contact.email_addresses.any? %> | ||
| <div class="block-container block-contact clearfix online-contact"> | ||
| <div class="block-1"> | ||
| <div class="inner-block"> | ||
| <h3> | ||
| Online | ||
| </h3> | ||
| </div> | ||
| </div> | ||
| <div class="block-2"> | ||
| <div class="inner-block"> | ||
| <% if contact.contact_form_links.any? %> | ||
| <div class="block-container clearfix <%= 'block-container-last' if contact.email_addresses.none? %>"> | ||
| <% if contact.email_addresses.any? %> | ||
| <h3> | ||
| Useful links | ||
| </h3> | ||
| <% end %> | ||
| <div class="useful-links <%= 'contact' if contact.email_addresses.any? %>"> | ||
| <%= govspeak contact.more_info_contact_form.to_s %> | ||
|
|
||
| <ul class="list-plain"> | ||
| <%= render contact.contact_form_links %> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
| <% if contact.email_addresses.any? %> | ||
| <div class="block-container clearfix block-container-last"> | ||
| <% if contact.email_addresses.any? %> | ||
| <h3> | ||
| </h3> | ||
| <% end %> | ||
| <div class="email <%= 'contact' if contact.contact_form_links.any? %>"> | ||
| <%= govspeak contact.more_info_email_address.to_s %> | ||
|
|
||
| <ul class="list-plain"> | ||
| <%= render contact.email_addresses %> | ||
| </ul> | ||
| </div> | ||
| <% if contact.contact_form_links.any? %> | ||
| <div class="block-container block-contact clearfix online-contact"> | ||
| <h2> | ||
| Online Forms | ||
| </h2> | ||
|
|
||
| <div class="block-inner"> | ||
| <div class="block-2 block-pull-left"> | ||
| <div class="useful-links <%= 'contact' if contact.email_addresses.any? %>"> | ||
| <ul class="form-links list-plain"> | ||
| <%= render contact.contact_form_links %> | ||
| </ul> | ||
| <%= govspeak contact.more_info_contact_form.to_s %> | ||
| </div> | ||
| <% end %> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <% end -%> | ||
| <% if contact.email_addresses.any? %> | ||
| <div class="block-container block-contact clearfix online-contact"> | ||
| <div class="block-1"> | ||
| <div class="inner-block"> | ||
| <h3> | ||
| </h3> | ||
| </div> | ||
| </div> | ||
| <div class="block-2"> | ||
| <div class="email"> | ||
| <%= govspeak contact.more_info_email_address.to_s %> | ||
| <ul class="list-plain"> | ||
| <%= render contact.email_addresses %> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
| <% end %> | ||
| <% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,4 @@ | ||
| <div class="block-container contact-intro clearfix"> | ||
| <div class="inner-block"> | ||
| <ul class="quick-links list-plain"> | ||
| <% if contact.quick_link_title_1.present? && contact.quick_link_1.present? %> | ||
| <li> | ||
| <%= link_to contact.quick_link_title_1, contact.quick_link_1 %> | ||
| <% if contact.quick_link_description_1.present? %> | ||
| <p> | ||
| <%= contact.quick_link_description_1 %> | ||
| </p> | ||
| <% end -%> | ||
| </li> | ||
| <% end %> | ||
| <% if contact.quick_link_title_2.present? && contact.quick_link_2.present? %> | ||
| <li> | ||
| <%= link_to contact.quick_link_title_2, contact.quick_link_2 %> | ||
| <% if contact.quick_link_description_2.present? %> | ||
| <p> | ||
| <%= contact.quick_link_description_2 %> | ||
| </p> | ||
| <% end -%> | ||
| </li> | ||
| <% end %> | ||
| <% if contact.quick_link_title_3.present? && contact.quick_link_3.present? %> | ||
| <li> | ||
| <%= link_to contact.quick_link_title_3, contact.quick_link_3 %> | ||
| <% if contact.quick_link_description_3.present? %> | ||
| <p> | ||
| <%= contact.quick_link_description_3 %> | ||
| </p> | ||
| <% end -%> | ||
| </li> | ||
| <% end %> | ||
| </ul> | ||
| </div> | ||
| </div> |
Oops, something went wrong.