Merge branch '3.8'

Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-06 17:39:41 +01:00
2 changed files with 7 additions and 1 deletions

View File

@@ -199,6 +199,7 @@
</thead> </thead>
</table> </table>
<div class="registration-wrapper PNB" style="top:160px;bottom: 50px;overflow: auto">
<div id="tab_demandes"> <div id="tab_demandes">
{% set tableColls = table['coll'] %} {% set tableColls = table['coll'] %}
{% for row in table['user'] %} {% for row in table['user'] %}
@@ -270,8 +271,9 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div>
<div class="form-actions"> <div class="PNB" style="top:auto;height: 30px;">
<button type="button" class="btn btn-primary submit">{{ 'boutton::valider' | trans }}</button> <button type="button" class="btn btn-primary submit">{{ 'boutton::valider' | trans }}</button>
</div> </div>
</form> </form>

View File

@@ -292,3 +292,7 @@ div.switch_right.unchecked {
#tab_demandes .dl-horizontal dt { #tab_demandes .dl-horizontal dt {
width: 130px; width: 130px;
} }
#tab_demandes .table .btn-group {
display: block;
}