Commit d74499df authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout 

# Conflicts:
#	composer.json
#	composer.lock
parent 6dd4cc48

module/Application/view/application/centre-cout/saisie.phtml

+7 −6
Original line number Diff line number Diff line
@@ -17,21 +17,22 @@ echo $this->form()->openTag($form); ?> 
</div>



<div class="row">

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('libelle')); ?>

    </div>

    <div class="col-md-6">

    <div class="col-md-4">

        <?= $this->formControlGroup($form->get('code')); ?>

    </div>

    <div class="col-md-8">

        <?= $this->formControlGroup($form->get('libelle')); ?>

    </div>

</div>



<div class="row">

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('activite')); ?>

        <?= $this->formControlGroup($form->get('type-ressource')); ?>

    </div>

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('type-ressource')); ?>

        <?= $this->formControlGroup($form->get('activite')); ?>

    </div>



</div>

<?= $this->formControlGroup($form->get('security')); ?>

<?= $this->formSubmit($form->get('submit')); ?>