Commit bbb40230 authored by David Foucher's avatar David Foucher

Merge branch 'improve-referentiel' into 'master'

adjust referentiel interface

See merge request !70
parents a8048d10 3d34d143
Pipeline #3557 passed with stage
in 1 minute and 27 seconds
...@@ -3,17 +3,18 @@ ...@@ -3,17 +3,18 @@
<div id="referentiel-main-div"> <div id="referentiel-main-div">
<div v-if="!this.isLoading"> <div v-if="!this.isLoading">
<div id="referentiel-main-row"> <div id="referentiel-main-row">
<div class="container ml-5 mr-2"> <div class="container-fluid pl-5 pr-5">
<div class="row"> <div class="row">
<div v-if="!isEditMode" :class="classCollapsedMenu"> <div v-if="!isEditMode" :class="classCollapsedMenu">
<div class="mb-3 pull-right"> <div class="pb-3 pull-right">
<button @click="collapsed = !collapsed" type="button" class="btn main-button mb-5"> <button @click="collapsed = !collapsed" type="button" class="btn main-button mb-5">
<span v-show="collapsed"><span class="chevron-toggle">&#8594;</span> Ouvrir le panneau</span> <span v-show="collapsed"><span class="chevron-toggle">&#8594;</span> Ouvrir le panneau</span>
<span v-show="!collapsed"><span class="chevron-toggle">&#8592;</span> Fermer le panneau</span> <span v-show="!collapsed"><span class="chevron-toggle">&#8592;</span> Fermer le panneau</span>
</button> </button>
</div> </div>
<br>
<div v-show="!collapsed"> <div v-show="!collapsed">
<h2 class="mb-5">Dispositifs de financement</h2> <h2 class="pt-5 mb-5">Dispositifs de financement</h2>
<RulesMenu title="Régionaux" namespace="région" class="rules-menu" @click="this.forceRerender()"></RulesMenu> <RulesMenu title="Régionaux" namespace="région" class="rules-menu" @click="this.forceRerender()"></RulesMenu>
<RulesMenu title="Nationaux" namespace="règles nationales" class="rules-menu"></RulesMenu> <RulesMenu title="Nationaux" namespace="règles nationales" class="rules-menu"></RulesMenu>
<RulesMenu title="Organismes paritaires" namespace="organisme paritaire" class="rules-menu"></RulesMenu> <RulesMenu title="Organismes paritaires" namespace="organisme paritaire" class="rules-menu"></RulesMenu>
......
...@@ -18,6 +18,12 @@ ...@@ -18,6 +18,12 @@
<h4 v-if="isEditMode" class="pull-right"><em>Modification de la règle</em></h4> <h4 v-if="isEditMode" class="pull-right"><em>Modification de la règle</em></h4>
<input v-else-if="this.modifiedHashFlag | this.newModification" v-b-modal.auth-modal type="button" class="main-button-primary btn pull-right" value="Soumettre une modification"/> <input v-else-if="this.modifiedHashFlag | this.newModification" v-b-modal.auth-modal type="button" class="main-button-primary btn pull-right" value="Soumettre une modification"/>
<!-- TODO: show gitlab link of modification if exists --> <!-- TODO: show gitlab link of modification if exists -->
<div v-else v-show="ruleComment != ''">
<span class="float-right" data-toggle="collapse" data-target="#rule-comment" aria-expanded="false" aria-controls="explain" style="cursor:pointer;" v-on:click="ruleCommentToggled=!ruleCommentToggled">
<button v-if="!ruleCommentToggled" class="btn main-button">Consulter la note de bas de page</button>
<button v-else class="btn main-button">Masquer la note</button>
</span>
</div>
</div> </div>
</div> </div>
<div v-show="!isEditMode" class="row"> <div v-show="!isEditMode" class="row">
...@@ -33,11 +39,6 @@ ...@@ -33,11 +39,6 @@
</div> </div>
<div v-show="!isEditMode && !viewModification"> <div v-show="!isEditMode && !viewModification">
<div v-show="ruleComment != ''"> <div v-show="ruleComment != ''">
<span data-toggle="collapse" data-target="#rule-comment" aria-expanded="false" aria-controls="explain" style="cursor:pointer;" v-on:click="ruleCommentToggled=!ruleCommentToggled">
<button v-if="!ruleCommentToggled" class="btn main-button">Voir les notes de règle</button>
<button v-else class="btn main-button">Masquer les notes</button>
</span>
<div id="rule-comment" class="mt-3 card collapse"> <div id="rule-comment" class="mt-3 card collapse">
<div class="card-body"> <div class="card-body">
{{ this.ruleComment }} {{ this.ruleComment }}
......
<template> <template>
<li> <li style="">
<div :class="{bold: isFolder}" @dblclick="makeFolder"> <div :class="{bold: isFolder}" class="" @dblclick="makeFolder" style="margin-left:2.5%">