From e5619547d5544a043dfec173f17020b09f882a98 Mon Sep 17 00:00:00 2001 From: hellekin Date: Thu, 11 Feb 2021 20:40:00 +0100 Subject: [FIX] Availability of agents --- app/views/agents/_agent.html.erb | 17 ++++++++++++++++- app/views/application/_user_info.html.erb | 4 ++++ app/views/layouts/application.html.erb | 2 +- app/views/taxonomies/_taxonomy.html.erb | 2 +- app/views/taxonomies/index.html.erb | 2 +- app/views/taxonomies/show.html.erb | 13 +++++++++++++ 6 files changed, 36 insertions(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/agents/_agent.html.erb b/app/views/agents/_agent.html.erb index 5a74df1..fda8bd0 100644 --- a/app/views/agents/_agent.html.erb +++ b/app/views/agents/_agent.html.erb @@ -3,13 +3,28 @@

<%= link_to agent.name, agent_url(agent) %>

<%= link_to agent_url(agent) %>

+ <% if current_agent == agent %> +
+

Vous faƮtes partie de cet agent

+

Ainsi que <%= pluralize(agent.members.count, 'membre') %>.

+ +
+ <% end %>

Statistiques

+ +<% content_for :debug do %> +<%=tag.pre agent.inspect %> +<% end %> diff --git a/app/views/application/_user_info.html.erb b/app/views/application/_user_info.html.erb index 048e6fb..a1a42d2 100644 --- a/app/views/application/_user_info.html.erb +++ b/app/views/application/_user_info.html.erb @@ -11,3 +11,7 @@ <% end %> + +<% content_for :debug do %> +<%= @current_user.avatar_url %> +<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 60b285a..ce42bb6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@ <%= yield :head %> - + >

<%= link_to image_tag("https://talk.incommon.cc/uploads/default/original/1X/92f926e8210ea7a5412d6e2bdabfa825233e808b.png", alt: "IN COMMON", size: "x4em"), '/' %>

<%= render 'application/user_info' %> diff --git a/app/views/taxonomies/_taxonomy.html.erb b/app/views/taxonomies/_taxonomy.html.erb index eb2dd79..79df167 100644 --- a/app/views/taxonomies/_taxonomy.html.erb +++ b/app/views/taxonomies/_taxonomy.html.erb @@ -1,4 +1,4 @@ -
+

<%= taxonomy.name %>

<%= h taxonomy.summary %>

<%= m taxonomy.description %>
diff --git a/app/views/taxonomies/index.html.erb b/app/views/taxonomies/index.html.erb index 705b0d4..fcbcb8b 100644 --- a/app/views/taxonomies/index.html.erb +++ b/app/views/taxonomies/index.html.erb @@ -1,5 +1,5 @@

Available Taxonomies

- <%= render collection: @taxonomies %> + <%= render partial: :taxonomy, collection: @taxonomies %>
diff --git a/app/views/taxonomies/show.html.erb b/app/views/taxonomies/show.html.erb index 99e9c89..3971acf 100644 --- a/app/views/taxonomies/show.html.erb +++ b/app/views/taxonomies/show.html.erb @@ -1 +1,14 @@ +<%#= map_container %> + <%= taxonomy_filter %> + +<% content_for :aside do %> +
+
+ +
+
+
+<% end %> + + -- cgit v1.2.3