diff --git a/app/views/admin/communication/blocks/edit.html.erb b/app/views/admin/communication/blocks/edit.html.erb index 069ad2c1dbe4cf966ddd56bf84bae9a0c1790023..dbb7ad566b425797f1391097f7e636a65b7a118a 100644 --- a/app/views/admin/communication/blocks/edit.html.erb +++ b/app/views/admin/communication/blocks/edit.html.erb @@ -4,7 +4,7 @@ # Default elements array to move outside : it is only required when block type has an elements list @block.data['elements'] ||= [] %> -<div id="app" v-cloak> +<div id="app" v-cloak style="opacity:0;"> <%= simple_form_for [:admin, @block] do |f| %> <div class="row"> <div class="col-xxl-4 col-md-6"> @@ -93,6 +93,7 @@ window.addEventListener('load', function(){ setTimeout(function() { app.mount('#app'); + document.getElementById('app').style.opacity = 1; }, 1000); }); </script> diff --git a/app/views/admin/communication/blocks/templates/partners/_edit.html.erb b/app/views/admin/communication/blocks/templates/partners/_edit.html.erb index 6181ea767b3040b2d493826f93b17c631530be51..24734d09e9aa4420bc88941302936f5e4997feab 100644 --- a/app/views/admin/communication/blocks/templates/partners/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/partners/_edit.html.erb @@ -1,11 +1,7 @@ <a class="<%= button_classes('mb-4 me-1') %>" - v-on:click="data.elements.push({name: '', url: '', logo: {}, type:'custom'})"> + v-on:click="data.elements.push({name: '', url: '', logo: {}})"> <%= t '.add_partner' %> </a> -<a class="<%= button_classes('mb-4') %>" - v-on:click="data.elements.push({id:'', type:'organization'})"> - <%= t '.add_organization' %> -</a> <draggable :list="data.elements" class="list-group" handle=".partnerHandle"> <div v-for="(partner, index) in data.elements" class="list-group-item"> <div class="d-flex"> @@ -15,19 +11,19 @@ </a> </div> <div class="flex-fill"> - <div class="row" v-if="partner.type === 'organization'"> + <div class="row mb-3"> <div class="col-lg-4"> <select :id="'organization-' + index + '-id'" class="form-select select" v-model="partner.id"> - <option value="" disabled><%= t '.organization_placeholder' %></option> + <option value="" :selected="!partner.id"><%= t '.unregistered_organization' %></option> <% current_university.organizations.ordered.each_with_index do |organization, index| %> <option value="<%= organization.id %>"><%= organization.name %></option> <% end %> </select> </div> </div> - <div class="row" v-if="partner.type === 'custom'"> + <div class="row" v-if="!partner.id"> <div class="col-lg-4"> <label class="form-label" :for="'partner-' + index + '-name'"><%= t '.partner_name_label' %></label>