Commit 232f1e66 authored by Naomi Guyer's avatar Naomi Guyer Committed by Robert Lyon
Browse files

Fixes to quota, file inputs, missing delete form (BUG 1465107)

Change-Id: Iba350e0b23c28c8f04dc52b67e760e969a8015cf
parent f7c7a3d7
......@@ -43,5 +43,5 @@ function account_delete_submit(Pieform $form, $values) {
}
$smarty = smarty();
$smarty->assign('form', $deleteform);
$smarty->assign('delete_form', $deleteform);
$smarty->display('account/delete.tpl');
......@@ -39,7 +39,12 @@ $quotasform = pieform(array(
'usebuttontag' => true,
'class' => 'btn btn-primary no-label',
'value' => get_string('save'),
)
),
'description' => array(
'type' => 'html',
'class' => 'text-block mtm',
'value' => '<p class="metadata">' .get_string('groupfilequotadescription', 'admin') . '</p>'
),
),
));
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -45,6 +45,14 @@
}
}
&.file {
input {
@include box-shadow(none);
border: 0;
line-height: 14px;
}
}
&.fake-form {
border: 0;
padding: 0;
......
......@@ -32,6 +32,10 @@
font-size: $font-size-base;
}
.text-inline {
.text-inline.text-inline { // specificity
display: inline-block;
}
.text-block.text-block { // specificity
display: block;
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -2,7 +2,9 @@
<div class="panel panel-default">
<h2 class="panel-heading">{str tag=groupquotas section=admin args=$groupname}</h2>
<div class="panel-body">
<p class="lead text-small">{str tag=managegroupquotadescription1 section=admin}</p>
<p class="lead text-small">
{str tag=managegroupquotadescription1 section=admin}
</p>
{$quotasform|safe}
</div>
</div>
......
......@@ -2,9 +2,7 @@
<div class="panel panel-danger mtxl">
<h2 class="panel-heading">
{str tag="deleteviewconfirm1" section="view"}
</h2>
<div class="panel-body">
<p class="lead text-small">{if $collectionnote}{$collectionnote|clean_html|safe}{/if}</p>
......@@ -16,4 +14,4 @@
</div>
</div>
{include file="footer.tpl"}
\ No newline at end of file
{include file="footer.tpl"}
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