Skip to content

Commit b672dac

Browse files
ptitfredptitfred
committed
More compact template
1 parent f37b865 commit b672dac

File tree

3 files changed

+81
-88
lines changed

3 files changed

+81
-88
lines changed

‎apps/transport/lib/transport_web/templates/dataset/_resource.html.heex‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -58,43 +58,42 @@
5858
<%= link("GTFS", to: resource_path(@conn, :details, related_gtfs_resource.resource_dst_id), class: "dark") %>
5959
</span>
6060
</div>
61-
<%= if Map.has_key?(unavailabilities, @resource.id) do %>
62-
<div>
63-
<span title={
64-
dgettext("page-dataset-details", "download availability over the last %{nb} days",
65-
nb: availability_number_days()
66-
)
67-
}>
68-
<img class="icon icon--uptime" src={static_path(@conn, "/images/icons/uptime.svg")} />
69-
<% availability_ratio = unavailabilities[@resource.id] %>
70-
<span class={availability_ratio_class(availability_ratio)}>
71-
<%= link("#{availability_ratio}%",
72-
to: resource_path(@conn, :details, @resource.id) <> "#download-availability"
73-
) %>
74-
</span>
75-
<span class="small"><%= dgettext("page-dataset-details", "Availability rate") %></span>
61+
<div :if={Map.has_key?(unavailabilities, @resource.id)}>
62+
<span title={
63+
dgettext("page-dataset-details", "download availability over the last %{nb} days",
64+
nb: availability_number_days()
65+
)
66+
}>
67+
<img class="icon icon--uptime" src={static_path(@conn, "/images/icons/uptime.svg")} />
68+
<% availability_ratio = unavailabilities[@resource.id] %>
69+
<span class={availability_ratio_class(availability_ratio)}>
70+
<%= link("#{availability_ratio}%",
71+
to: resource_path(@conn, :details, @resource.id) <> "#download-availability"
72+
) %>
7673
</span>
77-
</div>
78-
<% end %>
74+
<span class="small"><%= dgettext("page-dataset-details", "Availability rate") %></span>
75+
</span>
76+
</div>
7977
</div>
8078

81-
<%= if Resource.gtfs?(@resource) or not @resource.is_available do %>
82-
<div class={"resource-status-corner #{resource_class(@resource.is_available, gtfs_outdated?)}"}>
83-
<span class={resource_span_class(@resource)}>
84-
<%= unless @resource.is_available do %>
85-
<%= dgettext("page-dataset-details", "Not") %> <br />
86-
<%= dgettext("page-dataset-details", "available") %>
87-
<% else %>
88-
<%= if gtfs_outdated? == true do %>
89-
<%= dgettext("page-dataset-details", "Outdated") %>
90-
<% end %>
91-
<%= if gtfs_outdated? == false do %>
92-
<%= dgettext("page-dataset-details", "Up to date") %>
93-
<% end %>
79+
<div
80+
:if={Resource.gtfs?(@resource) or not @resource.is_available}
81+
class={"resource-status-corner #{resource_class(@resource.is_available, gtfs_outdated?)}"}
82+
>
83+
<span class={resource_span_class(@resource)}>
84+
<%= unless @resource.is_available do %>
85+
<%= dgettext("page-dataset-details", "Not") %> <br />
86+
<%= dgettext("page-dataset-details", "available") %>
87+
<% else %>
88+
<%= if gtfs_outdated? == true do %>
89+
<%= dgettext("page-dataset-details", "Outdated") %>
9490
<% end %>
95-
</span>
96-
</div>
97-
<% end %>
91+
<%= if gtfs_outdated? == false do %>
92+
<%= dgettext("page-dataset-details", "Up to date") %>
93+
<% end %>
94+
<% end %>
95+
</span>
96+
</div>
9897

9998
<%= if Resource.gtfs?(@resource) do %>
10099
<%= render(TransportWeb.DatasetView, "_resource_validation_summary_gtfs.html",
@@ -136,15 +135,16 @@
136135
<% end %>
137136
</div>
138137
<% end %>
139-
<%= if Resource.gbfs?(@resource) do %>
140-
<%= for version <- validation |> get_metadata_info("versions", []) do %>
141-
<a href={gbfs_documentation_link(version)} target="_blank">
142-
<span class="label version">
143-
<%= dgettext("page-dataset-details", "Version %{version}", version: version) %>
144-
</span>
145-
</a>
146-
<% end %>
147-
<% end %>
138+
<a
139+
:for={version <- validation |> get_metadata_info("versions", [])}
140+
:if={Resource.gbfs?(@resource)}
141+
href={gbfs_documentation_link(version)}
142+
target="_blank"
143+
>
144+
<span class="label version">
145+
<%= dgettext("page-dataset-details", "Version %{version}", version: version) %>
146+
</span>
147+
</a>
148148
</div>
149149
<div class="resource-actions">
150150
<div>

‎apps/transport/lib/transport_web/templates/dataset/_resources_container.html.heex‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
<% has_resources = not Enum.empty?(@resources || []) %>
22
<% has_reuser_message = not is_nil(assigns[:reuser_message]) %>
3-
<%= if has_resources or has_reuser_message do %>
4-
<section class="dataset__resources white" id={assigns[:section_id]}>
5-
<h2><%= @title %></h2>
6-
<p :if={has_reuser_message} class="information-message">
7-
<%= assigns[:reuser_message] %>
8-
</p>
3+
<section :if={has_resources or has_reuser_message} class="dataset__resources white" id={assigns[:section_id]}>
4+
<h2><%= @title %></h2>
5+
<p :if={has_reuser_message} class="information-message">
6+
<%= assigns[:reuser_message] %>
7+
</p>
98

10-
<div :if={!is_nil(assigns[:warning_message])} class="resources-message">
11-
<i class="fa fa-exclamation-triangle warning-red"></i>
12-
<%= assigns[:warning_message] %>
9+
<div :if={!is_nil(assigns[:warning_message])} class="resources-message">
10+
<i class="fa fa-exclamation-triangle warning-red"></i>
11+
<%= assigns[:warning_message] %>
12+
</div>
13+
<div>
14+
<div class="ressources-list">
15+
<%= for resource <- @resources |> order_resources_by_validity(assigns[:resources_infos]) |> order_resources_by_format() do %>
16+
<%= render(TransportWeb.DatasetView, "_resource.html",
17+
conn: @conn,
18+
resource: resource,
19+
resources_related_files: assigns[:resources_related_files],
20+
dataset: assigns[:dataset],
21+
resources_infos: assigns[:resources_infos],
22+
latest_resources_history_infos: assigns[:latest_resources_history_infos]
23+
) %>
24+
<% end %>
1325
</div>
14-
<div>
15-
<div class="ressources-list">
16-
<%= for resource <- @resources |> order_resources_by_validity(assigns[:resources_infos]) |> order_resources_by_format() do %>
17-
<%= render(TransportWeb.DatasetView, "_resource.html",
18-
conn: @conn,
19-
resource: resource,
20-
resources_related_files: assigns[:resources_related_files],
21-
dataset: assigns[:dataset],
22-
resources_infos: assigns[:resources_infos],
23-
latest_resources_history_infos: assigns[:latest_resources_history_infos]
24-
) %>
25-
<% end %>
26-
</div>
27-
</div>
28-
</section>
29-
<% end %>
26+
</div>
27+
</section>

‎apps/transport/lib/transport_web/templates/resource/_validation_summary.html.heex‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
<div id="issues" class="validation-navigation">
22
<nav class="issues-list validation" role="navigation">
3-
<%= for %{"severity" => severity, "issues" => issues} <- @validation_summary do %>
4-
<%= if Map.get(@severities_count, severity, 0) > 0 do %>
5-
<div class="validation-issue">
6-
<h4><%= @results_adapter.format_severity(severity, @severities_count[severity]) %></h4>
7-
<ul>
8-
<%= for %{"key" => key, "issue" => issue} <- issues do %>
9-
<li>
10-
<%= if issue["count"] > 0 do %>
11-
<%= link(
12-
"#{issue["title"]} (#{issue["count"]})",
13-
to:
14-
"#{current_url(@conn, %{"issue_type" => key, "token" => @token} |> Map.reject(fn {_, v} -> is_nil(v) end))}#issues",
15-
class: if(key == @results_adapter.issue_type(@issues.entries), do: "active")
16-
) %>
17-
<% end %>
18-
</li>
19-
<% end %>
20-
</ul>
21-
</div>
22-
<% end %>
23-
<% end %>
3+
<div
4+
:for={%{"severity" => severity, "issues" => issues} <- @validation_summary}
5+
:if={Map.get(@severities_count, severity, 0) > 0}
6+
class="validation-issue"
7+
>
8+
<h4><%= @results_adapter.format_severity(severity, @severities_count[severity]) %></h4>
9+
<ul>
10+
<li :for={%{"key" => key, "issue" => issue} <- issues} :if={issue["count"] > 0}>
11+
<%= link("#{issue["title"]} (#{issue["count"]})",
12+
to:
13+
"#{current_url(@conn, %{"issue_type" => key, "token" => @token} |> Map.reject(fn {_, v} -> is_nil(v) end))}#issues",
14+
class: if(key == @results_adapter.issue_type(@issues.entries), do: "active")
15+
) %>
16+
</li>
17+
</ul>
18+
</div>
2419
</nav>
2520
</div>
2621

0 commit comments

Comments
 (0)