Commit 65c8dcd6 authored by AudreyGl's avatar AudreyGl

Merge tenté

parents 7dd47057 d62efcb3
......@@ -23,12 +23,13 @@
<div class="row">
<ul id="menuResume">
<li>
<label>Définitions :</label>
<label>Définitions :</label><br>
<h4><%= debate.definitions%></h4>
</li>
<li>
<label>Sources :</label>
<label>Sources :</label><br>
<h4><%= debate.sources%></h4>
<<<<<<< HEAD
</li>
</ul>
<br><br><hr><br><br>
......@@ -48,6 +49,20 @@
</div>
<br>
=======
</li>
<li>
<label>Date :</label><br>
<input id="dateValue" type="date"><br>
</li>
<li>
<div class="row submit-row">
<button class="btn btn-block submit-form" id="end" >Afficher</button>
</div>
</li>
</ul>
</div>
>>>>>>> d62efcb331eeffa432075af514f070ecbf13c66c
<!--
<table id="syntheses" class="table table-striped table-bordered">
<thead>
......@@ -89,7 +104,7 @@
<div id="colDroite" class="col-md-2">
<div class="container">
<button class="btn btn-block btn-primary" onClick="showHideContrib()">Contribuer</button>
<br>
<ul id="lContrib">
<li>
<label>Type :</label>
......@@ -121,7 +136,8 @@
</div>
</li>
</ul>
<button class="btn btn-block btn-primary" onClick="showHideSynth()">Synthétiser</button>
<button class="btn btn-block btn-primary" onClick="showHideSynth()">Synthétiser</button>
<br>
<ul id="lSynth">
<li>
<h4 id="form-title">Synthétiser plusieurs noeuds</h4>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment