diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb index 8d9ed285e17282ca5affe5b67c070ac10b7cdae0..0569878bdbc435c611c53a213053f18a91324de4 100644 --- a/app/views/admin/education/programs/show.html.erb +++ b/app/views/admin/education/programs/show.html.erb @@ -122,8 +122,11 @@ <% end %> <% end %> +<% content_for :action_bar_left do %> + <%= destroy_link @program %> +<% end %> + <% content_for :action_bar_right do %> <%= preview_link %> <%= edit_link @program %> - <%= destroy_link @program %> <% end %> diff --git a/app/views/admin/education/schools/show.html.erb b/app/views/admin/education/schools/show.html.erb index 4ef8f5ae880852be52d49e7b0d6d719ebe472bd6..273d5439666b07101db04170e1d7933cd4ac6a29 100644 --- a/app/views/admin/education/schools/show.html.erb +++ b/app/views/admin/education/schools/show.html.erb @@ -58,7 +58,10 @@ <%= render 'admin/education/schools/show/roles', roles: @roles %> +<% content_for :action_bar_left do %> + <%= destroy_link @school %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @school %> - <%= destroy_link @school %> <% end %> diff --git a/app/views/admin/research/journal/articles/show.html.erb b/app/views/admin/research/journal/articles/show.html.erb index da0caf4c580b2ce48c876f4b961e3a202e7eb930..303fe4093e93a211ccc3102d5771e86e9c2e21e1 100644 --- a/app/views/admin/research/journal/articles/show.html.erb +++ b/app/views/admin/research/journal/articles/show.html.erb @@ -54,7 +54,10 @@ </div> </div> +<% content_for :action_bar_left do %> + <%= destroy_link @article %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @article %> - <%= destroy_link @article %> <% end %> diff --git a/app/views/admin/research/journal/volumes/show.html.erb b/app/views/admin/research/journal/volumes/show.html.erb index ecb910c398691e53c0b3d2032299e4ce356cca9f..26d0e416ec2a806ee094519e34ef2be5f438fc31 100644 --- a/app/views/admin/research/journal/volumes/show.html.erb +++ b/app/views/admin/research/journal/volumes/show.html.erb @@ -79,7 +79,10 @@ </div> </div> +<% content_for :action_bar_left do %> + <%= destroy_link @volume %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @volume %> - <%= destroy_link @volume %> <% end %> diff --git a/app/views/admin/research/journals/show.html.erb b/app/views/admin/research/journals/show.html.erb index cd56929b153499ca1cb12d1a3bd4e5aa7d13c97d..3243b7306446b04e956cd2440acfd7fa4cc47544 100644 --- a/app/views/admin/research/journals/show.html.erb +++ b/app/views/admin/research/journals/show.html.erb @@ -55,7 +55,10 @@ <%= render 'admin/research/journal/articles/list', articles: @articles %> </div> +<% content_for :action_bar_left do %> + <%= destroy_link @journal %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @journal %> - <%= destroy_link @journal %> <% end %> diff --git a/app/views/admin/research/laboratories/show.html.erb b/app/views/admin/research/laboratories/show.html.erb index 6c78d471c6e848c6025e6c0f4c890fcec4f5351b..38b6adcc77b32a3b00f22f3ffa72c71dd03d0e96 100644 --- a/app/views/admin/research/laboratories/show.html.erb +++ b/app/views/admin/research/laboratories/show.html.erb @@ -14,7 +14,10 @@ <%= render 'admin/research/laboratory/axes/list', axes: @axes %> </div> +<% content_for :action_bar_left do %> + <%= destroy_link @laboratory %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @laboratory %> - <%= destroy_link @laboratory %> <% end %> diff --git a/app/views/admin/research/laboratory/axes/show.html.erb b/app/views/admin/research/laboratory/axes/show.html.erb index 241fef013b3c394c729398522625830e6b20db7a..52adb140eb592b4d282d77c209ff6682f03c68b8 100644 --- a/app/views/admin/research/laboratory/axes/show.html.erb +++ b/app/views/admin/research/laboratory/axes/show.html.erb @@ -20,7 +20,10 @@ </div> </div> +<% content_for :action_bar_left do %> + <%= destroy_link @axis %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @axis %> - <%= destroy_link @axis %> <% end %> diff --git a/app/views/admin/research/theses/show.html.erb b/app/views/admin/research/theses/show.html.erb index 9e9880862ea9f7369375d6a832fd5088f0ddf845..53a07b0ea2da6f9bca5fa0bea6bc12d0530823dc 100644 --- a/app/views/admin/research/theses/show.html.erb +++ b/app/views/admin/research/theses/show.html.erb @@ -1,6 +1,9 @@ <% content_for :title, @thesis %> +<% content_for :action_bar_left do %> + <%= destroy_link @thesis %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @thesis %> - <%= destroy_link @thesis %> <% end %> diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb index 0a4a2e1914e42b6ef3fe5ee90d65cd1d0e616c5a..9d2dca4d2bf1c24dc7b1446d4e4be217f9c32e77 100644 --- a/app/views/admin/university/organizations/show.html.erb +++ b/app/views/admin/university/organizations/show.html.erb @@ -55,7 +55,10 @@ <%= @organization.kind %> </p> +<% content_for :action_bar_left do %> + <%= destroy_link @organization %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @organization %> - <%= destroy_link @organization %> <% end %> diff --git a/app/views/admin/university/people/show.html.erb b/app/views/admin/university/people/show.html.erb index c613c9003e87d038ee66eadf0c425be0b50baaf7..db2e0f177badf0c88839cb147a5044704a5939bb 100644 --- a/app/views/admin/university/people/show.html.erb +++ b/app/views/admin/university/people/show.html.erb @@ -19,7 +19,10 @@ </div> <% end %> +<% content_for :action_bar_left do %> + <%= destroy_link @person %> +<% end %> + <% content_for :action_bar_right do %> <%= edit_link @person %> - <%= destroy_link @person %> <% end %> diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml index 10e33442220e2e96674b50d4367dcfe8790d9177..c6bde4b0abbbe3c786309fe985f13507c6aee6f6 100644 --- a/config/locales/university/en.yml +++ b/config/locales/university/en.yml @@ -89,6 +89,13 @@ en: linkedin: "Example: https://www.linkedin.com/in/osuny" tenure: "To differ from temporary lecturer." twitter: "Example: osuny" + enums: + university: + organization: + kind: + company: Company + non_profit: Association + government: Government university: invoice_informations: Invoice informations person: diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml index 43b7cb9063ca2accd62039da43e86fc799700918..7d9c2c564b567871da0ae85e913c714dbdc96e72 100644 --- a/config/locales/university/fr.yml +++ b/config/locales/university/fr.yml @@ -91,6 +91,13 @@ fr: linkedin: "Exemple : https://www.linkedin.com/in/osuny" tenure: "À différencier d'une personne vacataire." twitter: "Exemple : osuny" + enums: + university: + organization: + kind: + company: Entreprise + non_profit: Association + government: Structure gouvernementale university: invoice_informations: Données de facturation person: