-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into add-api-tests-postman
- Loading branch information
Showing
6 changed files
with
59 additions
and
3 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
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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <div class="row"> | ||
| <div class="twelve columns"> | ||
| <div class="tab-bar-container"> | ||
| <div class="row"> | ||
|
|
||
| <div class="projects-nav six columns"> | ||
| <nav> | ||
| <ul class="tab-bar"> | ||
| <li <%= active=="projects" ? "class='active'" : ""%>><a href="/regions/<%= region[:code] %>/projects">All Projects (<%=project_count%>)</a></li> | ||
| </ul> | ||
| </nav> | ||
| </div> | ||
|
|
||
| <div class="button-row six columns"> | ||
| <% regionSubscription = false | ||
| if project_count > 0 && regionSubscription%> | ||
| <span> | ||
| <a href="https://public.govdelivery.com/accounts/UKDFID/subscriber/new?topic_id=UKDFID_<%= format_query_string region['code'] %>" title="Subscribe to receive updates on <%= region['name'] %> by email" class="button inform">✉ Subscribe</a> | ||
| </span> | ||
| <% end %> | ||
| <span> | ||
| <a href="/fraud?region=<%= format_query_string region[:name] %>" class="button serious" title="Report fraud">Report Fraud</a> | ||
| </span> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
|
|
||
| <div id="page-title" class="row"> | ||
| <div class="twelve columns"> | ||
| <img src="/images/ukaid_logo.png" alt="UK aid from the British people"> | ||
| <div> | ||
| <div class="breadcrumb"> | ||
| <ul> | ||
| <li><a href="/">Home</a></li> | ||
| <% if region[:type] == "Regional" then %> | ||
| <li><a href="/location/regional">Aid by Location</a></li> | ||
| <% else %> | ||
| <li><a href="/location/global">Aid by Location</a></li> | ||
| <% end %> | ||
| <li><%= region[:name] %></li> | ||
| </ul> | ||
| </div> | ||
| <h1> | ||
| <%= region[:name] + " Region"%> | ||
| </h1> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <%= erb :'partials/_regions-summary-tabs', :locals => { :active => "projects", :region => region, :project_count => total_projects} %> | ||
| <%= erb :'partials/_project_list', :locals => { :projects => projects, :region => region, :project_count => total_projects, :countryAllProjectFilters => countryAllProjectFilters, :highLevelSectorList => highLevelSectorList, :oipa_api_url => oipa_api_url, :total_projects => total_projects, :budgetHigherBound => budgetHigherBound, :actualStartDate => actualStartDate, :plannedEndDate => plannedEndDate } %> |