Commit 07b0254d authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Made buttons on copy collection page top aligned - Bug #1530008"

parents f2756333 bd9480f5
......@@ -6274,15 +6274,15 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
'type' => 'hidden',
'value' => true,
),
'submitcollection' => array(
'type' => 'hidden',
'value' => false,
),
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-plus icon-lg left" role="presentation" aria-hidden="true"></span>' . get_string('createview', 'view'),
),
'submitcollection' => array(
'type' => 'hidden',
'value' => false,
)
)
);
......@@ -6312,7 +6312,7 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
$form['elements']['submitcollection'] = array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-xs last btn-group-item',
'class' => 'btn-default btn-xs btn-group-item',
'value' => get_string('copycollection', 'collection'),
);
}
......@@ -6323,6 +6323,9 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
);
$form['elements']['submit']['value'] = get_string('copyview', 'view');
$form['elements']['submit']['class'] = 'btn-default btn-xs btn-group-item';
if ($collection !== null) {
$form['elements']['submit']['class'] .= ' last';
}
$form['name'] .= $template;
}
return $form;
......
......@@ -153,6 +153,9 @@ td.btn-group {
td.action-list-copy {
min-width: 195px;
.btn-group-top {
margin-top: -8px;
}
}
// Often the same template is used to render buttons at the top of the page and
......@@ -365,4 +368,4 @@ td.action-list-copy {
// Group categories.php: 138
.btn-add-group {
margin-top: 20px;
}
\ No newline at end of file
}
......@@ -39,7 +39,7 @@
<td class="owner">-</td>
{/if}
<td class="action-list-copy">
<div class="btn-group">
<div class="btn-group btn-group-top">
{$row.form|safe}
</div>
</td>
......@@ -53,4 +53,3 @@
{str tag="nocopyableviewsfound" section=view}
</div>
{/if}
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