mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch '3.8'
Conflicts: lib/classes/task/Scheduler.php templates/web/admin/user/demand.html.twig
This commit is contained in:
@@ -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>
|
||||||
|
@@ -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;
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user