From 06edcf3f3f523adf8fb87ec1846cdd505e53db0a Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Mon, 4 Dec 2017 11:13:55 +0100
Subject: [PATCH] =?UTF-8?q?suppression=20des=20div=20container=20superflus?=
=?UTF-8?q?,=20les=20composants=20Angular=20de=20l'appli=20ne=20g=C3=A9n?=
=?UTF-8?q?=C3=A8rent=20que=20des=20div=20de=20type=20"row"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.component.html | 14 ++-
.../cond_distri/conddistri.component.html | 8 +-
.../generic/calculator.component.html | 24 ++--
.../lechaptcalmon.component.html | 6 +-
.../regime-uniforme.component.html | 6 +-
.../calculators/remous/remous.component.html | 6 +-
.../section-param.component.html | 6 +-
.../calculator-results.component.html | 79 ++++++-------
src/app/components/field-set/field-set.html | 10 +-
.../param-field-line/param-field-line.html | 104 +++++++++---------
.../param-input/param-input.component.html | 42 ++++---
.../remous-results.component.html | 100 +++++++++--------
.../section-results.component.html | 28 +++--
.../select-field-line/select-field-line.html | 28 +++--
14 files changed, 222 insertions(+), 239 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 033258eac..2ec809177 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -61,11 +61,13 @@
<main>
- <cond-distri *ngIf="isDisplayCondDistri()"></cond-distri>
- <lechapt-calmon *ngIf="isDisplayLechaptCalmon()"></lechapt-calmon>
- <regime-uniforme *ngIf="isDisplayRegimeUnif()"></regime-uniforme>
- <section-param *ngIf="isDisplaySectionParam()"></section-param>
- <courbe-remous *ngIf="isDisplayCourbeRemous()"></courbe-remous>
+ <div class="container-fluid">
+ <cond-distri *ngIf="isDisplayCondDistri()"></cond-distri>
+ <lechapt-calmon *ngIf="isDisplayLechaptCalmon()"></lechapt-calmon>
+ <regime-uniforme *ngIf="isDisplayRegimeUnif()"></regime-uniforme>
+ <section-param *ngIf="isDisplaySectionParam()"></section-param>
+ <courbe-remous *ngIf="isDisplayCourbeRemous()"></courbe-remous>
+ </div>
</main>
<footer>
@@ -74,4 +76,4 @@
<br>
<a href="http://www.irstea.fr/">Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</a>
</div> -->
-</footer>
+</footer>
\ No newline at end of file
diff --git a/src/app/calculators/cond_distri/conddistri.component.html b/src/app/calculators/cond_distri/conddistri.component.html
index e2528b4fc..b6224435e 100644
--- a/src/app/calculators/cond_distri/conddistri.component.html
+++ b/src/app/calculators/cond_distri/conddistri.component.html
@@ -1,8 +1,6 @@
-<div class="container-fluid">
- <div class="row">
- <div class="col">
- <h1>{{uitextTitre}}</h1>
- </div>
+<div class="row">
+ <div class="col">
+ <h1>{{uitextTitre}}</h1>
</div>
</div>
<hydrocalc type="ConduiteDistributrice"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/generic/calculator.component.html b/src/app/calculators/generic/calculator.component.html
index 2527c0eed..c430304b0 100644
--- a/src/app/calculators/generic/calculator.component.html
+++ b/src/app/calculators/generic/calculator.component.html
@@ -1,23 +1,21 @@
<field-set *ngFor="let fs of fieldSets" [style.display]="getFieldsetStyleDisplay(fs.id)" [formId]=_formulaire.uid [id]=fs.id
[fieldSet]=fs (onRadio)=onRadioClick($event) (onSelectChange)=onSelectChanged($event)></field-set>
-<div class="container-fluid">
- <div class="row ">
- <div class="col text-center">
- <p></p>
- </div>
+<div class="row ">
+ <div class="col text-center">
+ <p></p>
</div>
+</div>
- <div class="row ">
- <div class="col text-center">
- <button type="button" class="button_compute" name="Calculer" (click)="doCompute()">{{uitextCalculer}}</button>
- </div>
+<div class="row ">
+ <div class="col text-center">
+ <button type="button" class="button_compute" name="Calculer" (click)="doCompute()">{{uitextCalculer}}</button>
</div>
+</div>
- <div class="row ">
- <div class="col text-center">
- <p></p>
- </div>
+<div class="row ">
+ <div class="col text-center">
+ <p></p>
</div>
</div>
<calc-results [style.display]="getResultsStyleDisplay()"></calc-results>
diff --git a/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html b/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
index f4342e38c..7f6cabebe 100644
--- a/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
+++ b/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
@@ -1,2 +1,6 @@
-<h1>{{uitextTitre}}</h1>
+<div class="row">
+ <div class="col">
+ <h1>{{uitextTitre}}</h1>
+ </div>
+</div>
<hydrocalc type="LechaptCalmon"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/regime-uniforme/regime-uniforme.component.html b/src/app/calculators/regime-uniforme/regime-uniforme.component.html
index 2f171cdac..530b56067 100644
--- a/src/app/calculators/regime-uniforme/regime-uniforme.component.html
+++ b/src/app/calculators/regime-uniforme/regime-uniforme.component.html
@@ -1,2 +1,6 @@
-<h1>{{uitextTitre}}</h1>
+<div class="row">
+ <div class="col">
+ <h1>{{uitextTitre}}</h1>
+ </div>
+</div>
<hydrocalc type="RegimeUniforme"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/remous/remous.component.html b/src/app/calculators/remous/remous.component.html
index d17503f51..657c5484f 100644
--- a/src/app/calculators/remous/remous.component.html
+++ b/src/app/calculators/remous/remous.component.html
@@ -1,2 +1,6 @@
-<h1>{{uitextTitre}}</h1>
+<div class="row">
+ <div class="col">
+ <h1>{{uitextTitre}}</h1>
+ </div>
+</div>
<hydrocalc type="CourbeRemous"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/section-param/section-param.component.html b/src/app/calculators/section-param/section-param.component.html
index 23795c8b7..96828c6cb 100644
--- a/src/app/calculators/section-param/section-param.component.html
+++ b/src/app/calculators/section-param/section-param.component.html
@@ -1,2 +1,6 @@
-<h1>{{uitextTitre}}</h1>
+<div class="row">
+ <div class="col">
+ <h1>{{uitextTitre}}</h1>
+ </div>
+</div>
<hydrocalc type="SectionParametree"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/components/calculator-results/calculator-results.component.html b/src/app/components/calculator-results/calculator-results.component.html
index 357aa90de..b73394ef0 100644
--- a/src/app/components/calculator-results/calculator-results.component.html
+++ b/src/app/components/calculator-results/calculator-results.component.html
@@ -1,54 +1,37 @@
-<div class="container-fluid">
- <div class="row">
- <div class="col-8 mx-auto">
- <chart *ngIf="showVarResults" [type]="graph_type" [data]="graph_data" [options]="graph_options">
- </chart>
- </div>
+<div class="row">
+ <div class="col-8 mx-auto">
+ <chart *ngIf="showVarResults" [type]="graph_type" [data]="graph_data" [options]="graph_options">
+ </chart>
</div>
</div>
-<div class="container-fluid">
- <div class="row">
-
- <!-- table des résultats fixés -->
- <div class="col-4 mx-auto" *ngIf="showFixedResults">
- <div class="container">
- <div class="row">
- <div class="col-12">
- <table class="table">
- <tr>
- <th>{{uitextParamFixes}}</th>
- <th>{{uitextValeurs}}</th>
- </tr>
- <!-- <tr *ngFor="let r of _fixedResults; let i=index" [class]="getFixedResultClass(i)"> -->
- <tr *ngFor="let r of _fixedResults; let i=index">
- <td class="result_label {{getFixedResultClass(i)}}">{{r.label}}</td>
- <td class="result_value {{getFixedResultClass(i)}}">{{r.value}}</td>
- </tr>
- </table>
- </div>
- </div>
- </div>
- </div>
+<div class="row">
+ <!-- table des résultats fixés -->
+ <div class="col-4 mx-auto" *ngIf="showFixedResults">
+ <table class="table">
+ <tr>
+ <th>{{uitextParamFixes}}</th>
+ <th>{{uitextValeurs}}</th>
+ </tr>
+ <!-- <tr *ngFor="let r of _fixedResults; let i=index" [class]="getFixedResultClass(i)"> -->
+ <tr *ngFor="let r of _fixedResults; let i=index">
+ <td class="result_label {{getFixedResultClass(i)}}">{{r.label}}</td>
+ <td class="result_value {{getFixedResultClass(i)}}">{{r.value}}</td>
+ </tr>
+ </table>
+ </div>
- <!-- table des résultats variés -->
- <div class="col-5 mx-auto" *ngIf="showVarResults">
- <div class="container">
- <div class="row">
- <div class="col-12">
- <table class="table table-striped">
- <tr>
- <th>{{_variableParamHeader}}</th>
- <th>{{_variableResultHeader}}</th>
- </tr>
- <tr *ngFor="let r of _varResults; let i=index">
- <td class="result_label">{{r.param}}</td>
- <td class="result_value">{{r.result}}</td>
- </tr>
- </table>
- </div>
- </div>
- </div>
- </div>
+ <!-- table des résultats variés -->
+ <div class="col-5 mx-auto" *ngIf="showVarResults">
+ <table class="table table-striped">
+ <tr>
+ <th>{{_variableParamHeader}}</th>
+ <th>{{_variableResultHeader}}</th>
+ </tr>
+ <tr *ngFor="let r of _varResults; let i=index">
+ <td class="result_label">{{r.param}}</td>
+ <td class="result_value">{{r.result}}</td>
+ </tr>
+ </table>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/components/field-set/field-set.html b/src/app/components/field-set/field-set.html
index 5c4ab3fbf..2d171bfbd 100644
--- a/src/app/components/field-set/field-set.html
+++ b/src/app/components/field-set/field-set.html
@@ -1,8 +1,6 @@
-<div class="container-fluid">
- <div class="row">
- <div class="col-12 fieldset_title">
- {{title}}
- </div>
+<div class="row">
+ <div class="col-12 fieldset_title">
+ {{title}}
</div>
</div>
@@ -24,4 +22,4 @@
</select-field-line>
<check-field-line *ngIf="p.isCheck" [formId]=formId [id]=p.id></check-field-line>
-</ng-template>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/components/param-field-line/param-field-line.html b/src/app/components/param-field-line/param-field-line.html
index 661d79523..249fd9800 100644
--- a/src/app/components/param-field-line/param-field-line.html
+++ b/src/app/components/param-field-line/param-field-line.html
@@ -1,69 +1,65 @@
-<div class="container-fluid">
- <div class="row">
- <!-- titre -->
- <div class="col-3 param_title">
- {{title}}
- </div>
+<div class="row">
+ <!-- titre -->
+ <div class="col-3 param_title">
+ {{title}}
+ </div>
- <!-- input de saisie de la valeur -->
- <div class="col-3 col-sm-2">
- <param-input [inputDisabled]="isInputDisabled" [computeNodeType]="nodeType" [symbol]="symbol"></param-input>
- </div>
+ <!-- input de saisie de la valeur -->
+ <div class="col-3 col-sm-2">
+ <param-input [inputDisabled]="isInputDisabled" [computeNodeType]="nodeType" [symbol]="symbol"></param-input>
+ </div>
- <!-- radio "fixé" -->
- <div class="col-sm-2 col-md-2 col-lg-1">
- <input *ngIf="hasRadioFix()" type="radio" name="radio_param_{{symbol}}" value="fix" (click)="onRadioClick(symbol, 'fix')"
- [checked]=radioFixCheck [disabled]=isDisabled id="radio_fix" />
- <label *ngIf="hasRadioFix()" for="radio_fix">{{uitextParamFixe}}</label>
- </div>
+ <!-- radio "fixé" -->
+ <div class="col-sm-2 col-md-2 col-lg-1">
+ <input *ngIf="hasRadioFix()" type="radio" name="radio_param_{{symbol}}" value="fix" (click)="onRadioClick(symbol, 'fix')"
+ [checked]=radioFixCheck [disabled]=isDisabled id="radio_fix" />
+ <label *ngIf="hasRadioFix()" for="radio_fix">{{uitextParamFixe}}</label>
+ </div>
- <!-- radio "varier" -->
- <div class="col-sm-2 col-md-2 col-lg-1">
- <input *ngIf="hasRadioVar()" type="radio" name="radio_param_{{symbol}}" value="var" (click)="onRadioClick(symbol,
+ <!-- radio "varier" -->
+ <div class="col-sm-2 col-md-2 col-lg-1">
+ <input *ngIf="hasRadioVar()" type="radio" name="radio_param_{{symbol}}" value="var" (click)="onRadioClick(symbol,
'var')" [checked]=radioVarCheck [disabled]=isDisabled id="radio_var" />
- <label *ngIf="hasRadioVar()" for="radio_var">{{uitextParamVarier}}</label>
- </div>
+ <label *ngIf="hasRadioVar()" for="radio_var">{{uitextParamVarier}}</label>
+ </div>
- <!-- radio "calculer" -->
- <div class="col-sm-3 col-md-2 col-lg-2">
- <input *ngIf="hasRadioCal()" type="radio" name="radio_param_{{symbol}}" value="cal" (click)="onRadioClick(symbol,
+ <!-- radio "calculer" -->
+ <div class="col-sm-3 col-md-2 col-lg-2">
+ <input *ngIf="hasRadioCal()" type="radio" name="radio_param_{{symbol}}" value="cal" (click)="onRadioClick(symbol,
'cal')" [checked]=radioCalCheck [disabled]=isDisabled id="radio_cal" />
- <label *ngIf="hasRadioCal()" for="radio_cal">{{uitextParamCalculer}}</label>
- </div>
+ <label *ngIf="hasRadioCal()" for="radio_cal">{{uitextParamCalculer}}</label>
</div>
</div>
-<div class="container-fluid" [style.display]="isVarRadio">
- <div class="row">
- <div class="col-sm-1 col-md-5"></div>
- <div class="col-sm-4 col-md-3 col-lg-2">
- {{uitextValeurMini}}
- </div>
- <div class="col-2">
- <!-- <input [(ngModel)]="_param.minValue"> -->
- <input type="text" class="input-alternate" name="inputmin" placeholder="min" [(ngModel)]="_param.minValue" />
- </div>
+<div class="row" [style.display]="isVarRadio">
+ <div class="col-sm-1 col-md-5"></div>
+ <div class="col-sm-4 col-md-3 col-lg-2">
+ {{uitextValeurMini}}
+ </div>
+ <div class="col-2">
+ <!-- <input [(ngModel)]="_param.minValue"> -->
+ <input type="text" class="input-alternate" name="inputmin" placeholder="min" [(ngModel)]="_param.minValue" />
</div>
+</div>
- <div class="row">
- <div class="col-sm-1 col-md-5"></div>
- <div class="col-sm-4 col-md-3 col-lg-2">
- {{uitextValeurMaxi}}
- </div>
- <div class="col-2">
- <!-- <input [(ngModel)]="_param.maxValue"> -->
- <input type="text" class="input-alternate" name="inputmax" placeholder="max" [(ngModel)]="_param.maxValue" />
- </div>
+<div class="row" [style.display]="isVarRadio">
+ <div class="col-sm-1 col-md-5"></div>
+ <div class="col-sm-4 col-md-3 col-lg-2">
+ {{uitextValeurMaxi}}
+ </div>
+ <div class="col-2">
+ <!-- <input [(ngModel)]="_param.maxValue"> -->
+ <input type="text" class="input-alternate" name="inputmax" placeholder="max" [(ngModel)]="_param.maxValue" />
</div>
+</div>
- <div class="row">
- <div class="col-sm-1 col-md-5"></div>
- <div class="col-sm-4 col-md-3 col-lg-2">
- {{uitextPasVariation}}
- </div>
- <div class="col-2">
- <!-- <input [(ngModel)]="_param.stepValue"> -->
- <input type="text" class="input-alternate" name="inputstep" placeholder="step" [(ngModel)]="_param.stepValue" />
- </div>
+<div class="row" [style.display]="isVarRadio">
+ <div class="col-sm-1 col-md-5"></div>
+ <div class="col-sm-4 col-md-3 col-lg-2">
+ {{uitextPasVariation}}
+ </div>
+ <div class="col-2">
+ <!-- <input [(ngModel)]="_param.stepValue"> -->
+ <input type="text" class="input-alternate" name="inputstep" placeholder="step" [(ngModel)]="_param.stepValue" />
</div>
</div>
\ No newline at end of file
diff --git a/src/app/components/param-input/param-input.component.html b/src/app/components/param-input/param-input.component.html
index 5626abaa8..14ef2479a 100644
--- a/src/app/components/param-input/param-input.component.html
+++ b/src/app/components/param-input/param-input.component.html
@@ -1,27 +1,25 @@
-<div class="container">
- <div class="row" *ngIf="displayTitle">
- <div class="col-12">
- {{uitextParamInput}}
- </div>
+<div class="row" *ngIf="displayTitle">
+ <div class="col-12">
+ {{uitextParamInput}}
</div>
+</div>
- <div class="row">
- <div class="col-12">
- <form>
- <div class="md-form">
- <!-- <input mdbActive type="text" class="form-control" id="form1" name="email" mdbInputValidate> -->
- <input type="text" class="input-alternate" id="form1" name="form1" [disabled]="_inputDisabled" placeholder="{{_paramDef.symbol}}"
- [ngModel]="_uiValue.uncheckedValueString" (ngModelChange)="setValue($event)" />
- <label class="active" for="form1" *ngIf="displayTitle">{{uitextParamInput}}</label>
- <small class="text-danger">{{_message}}</small>
- </div>
- </form>
- </div>
+<div class="row">
+ <div class="col-10">
+ <form>
+ <div class="md-form">
+ <!-- <input mdbActive type="text" class="form-control" id="form1" name="email" mdbInputValidate> -->
+ <input type="text" class="input-alternate" id="form1" name="form1" [disabled]="_inputDisabled" placeholder="{{_paramDef.symbol}}"
+ [ngModel]="_uiValue.uncheckedValueString" (ngModelChange)="setValue($event)" />
+ <label class="active" for="form1" *ngIf="displayTitle">{{uitextParamInput}}</label>
+ <small class="text-danger">{{_message}}</small>
+ </div>
+ </form>
</div>
+</div>
- <div class="row" *ngIf="displayTitle">
- <div class="col-12">
- {{_message}}
- </div>
+<div class="row" *ngIf="displayTitle">
+ <div class="col-12">
+ {{_message}}
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/remous-results/remous-results.component.html b/src/app/components/remous-results/remous-results.component.html
index 2fd74e10f..c79659dc7 100644
--- a/src/app/components/remous-results/remous-results.component.html
+++ b/src/app/components/remous-results/remous-results.component.html
@@ -1,58 +1,56 @@
-<div class="container-fluid">
- <div class="row">
- <div class="col-12 mx-auto">
- <chart [type]="graph1_type" [data]="graph1_data" [options]="graph1_options"></chart>
- </div>
+<div class="row">
+ <div class="col-12 mx-auto">
+ <chart [type]="graph1_type" [data]="graph1_data" [options]="graph1_options"></chart>
</div>
- <div class="row">
- <div class="col-12 mx-auto">
- <chart *ngIf="_extraGraph" [type]="graph2_type" [data]="graph2_data" [options]="graph2_options"></chart>
- </div>
+</div>
+<div class="row">
+ <div class="col-12 mx-auto">
+ <chart *ngIf="_extraGraph" [type]="graph2_type" [data]="graph2_data" [options]="graph2_options"></chart>
</div>
- <div class="row">
- <div class="col-xs-12 col-lg-10 mx-auto">
- <!-- journal -->
- <table class="table">
- <thead>
- <tr>
- <th>{{uitextTitreJournal}}</th>
- </tr>
- </thead>
- <tr *ngFor="let r of _logEntries">
- <td align="left">{{r}}</td>
+</div>
+<div class="row">
+ <div class="col-xs-12 col-lg-10 mx-auto">
+ <!-- journal -->
+ <table class="table">
+ <thead>
+ <tr>
+ <th>{{uitextTitreJournal}}</th>
</tr>
- </table>
- </div>
+ </thead>
+ <tr *ngFor="let r of _logEntries">
+ <td align="left">{{r}}</td>
+ </tr>
+ </table>
</div>
- <br/>
- <div class="row">
- <div class="col-xs-12 col-lg-6 mx-auto">
- <!-- résultats numériques -->
- <table class="table">
- <thead>
- <tr>
- <th></th>
- <th>{{uitextLigneFluviale}}</th>
- <th></th>
- <th>{{uitextLigneTorrentielle}}</th>
- <th></th>
- </tr>
- <tr>
- <th>{{uitextAbscisse}}</th>
- <th>{{uitextTirant}}</th>
- <th>{{_extraParamLabel}}</th>
- <th>{{uitextTirant}}</th>
- <th>{{_extraParamLabel}}</th>
- </tr>
- </thead>
- <tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
- <td>{{r.abs}}</td>
- <td>{{r.flu}}</td>
- <td>{{r.extraFlu}}</td>
- <td>{{r.tor}}</td>
- <td>{{r.extraTor}}</td>
+</div>
+<br/>
+<div class="row">
+ <div class="col-xs-12 col-lg-6 mx-auto">
+ <!-- résultats numériques -->
+ <table class="table">
+ <thead>
+ <tr>
+ <th></th>
+ <th>{{uitextLigneFluviale}}</th>
+ <th></th>
+ <th>{{uitextLigneTorrentielle}}</th>
+ <th></th>
</tr>
- </table>
- </div>
+ <tr>
+ <th>{{uitextAbscisse}}</th>
+ <th>{{uitextTirant}}</th>
+ <th>{{_extraParamLabel}}</th>
+ <th>{{uitextTirant}}</th>
+ <th>{{_extraParamLabel}}</th>
+ </tr>
+ </thead>
+ <tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
+ <td>{{r.abs}}</td>
+ <td>{{r.flu}}</td>
+ <td>{{r.extraFlu}}</td>
+ <td>{{r.tor}}</td>
+ <td>{{r.extraTor}}</td>
+ </tr>
+ </table>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/components/section-results/section-results.component.html b/src/app/components/section-results/section-results.component.html
index 116fe53b8..e21f3bd98 100644
--- a/src/app/components/section-results/section-results.component.html
+++ b/src/app/components/section-results/section-results.component.html
@@ -1,18 +1,16 @@
-<div class="container-fluid">
- <div class="row">
- <div class="col-xs-2 col-md-6">
- <!-- graphique -->
- <section-canvas class="float-xs-none float-md-right" #sectionCanvas></section-canvas>
- </div>
+<div class="row">
+ <div class="col-xs-2 col-md-6">
+ <!-- graphique -->
+ <section-canvas class="float-xs-none float-md-right" #sectionCanvas></section-canvas>
+ </div>
- <div class="col-xs-2 col-md-6">
- <!-- tableau de valeurs -->
- <table>
- <tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
- <td class="result_label">{{r.label}}</td>
- <td class="result_value">{{r.value}}</td>
- </tr>
- </table>
- </div>
+ <div class="col-xs-2 col-md-6">
+ <!-- tableau de valeurs -->
+ <table>
+ <tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
+ <td class="result_label">{{r.label}}</td>
+ <td class="result_value">{{r.value}}</td>
+ </tr>
+ </table>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/components/select-field-line/select-field-line.html b/src/app/components/select-field-line/select-field-line.html
index faad38143..dfab891e8 100644
--- a/src/app/components/select-field-line/select-field-line.html
+++ b/src/app/components/select-field-line/select-field-line.html
@@ -1,19 +1,17 @@
-<div class="container-fluid">
- <div class="row">
- <!-- titre -->
- <div class="col-3 select_title">
- {{_select.label}}
- </div>
+<div class="row">
+ <!-- titre -->
+ <div class="col-3 select_title">
+ {{_select.label}}
+ </div>
- <!-- liste déroulante -->
- <div class="col-4 col-sm-3">
- <div class="btn-group" dropdown (click)="onSelect($event)">
- <button dropdownToggle class="btn grey darken-3 dropdown-toggle waves-light" type="button" mdbRippleRadius>
- {{currentLabel}}
- </button>
- <div class="dropdown-menu">
- <a class="dropdown-item" *ngFor="let e of entries" [value]=e.value>{{e.label}}</a>
- </div>
+ <!-- liste déroulante -->
+ <div class="col-4 col-sm-3">
+ <div class="btn-group" dropdown (click)="onSelect($event)">
+ <button dropdownToggle class="btn grey darken-3 dropdown-toggle waves-light" type="button" mdbRippleRadius>
+ {{currentLabel}}
+ </button>
+ <div class="dropdown-menu">
+ <a class="dropdown-item" *ngFor="let e of entries" [value]=e.value>{{e.label}}</a>
</div>
</div>
</div>
--
GitLab