Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop

This commit is contained in:
m-lopez-f 2017-02-20 12:56:38 +01:00
commit 3ffe8ae49f
1 changed files with 25 additions and 24 deletions

View File

@ -202,38 +202,39 @@ else {
} }
array_push ($table->data, $data); array_push ($table->data, $data);
} }
html_print_table($table);
} }
echo "<table width='100%'>";
echo "<tr>";
echo "<td>";
echo "<div style='float: right;'>";
if (!empty($messages)) {
if ($show_sent)
echo '<form method="post" style="float:right;" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1&amp;multiple_delete=1">';
else
echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&amp;multiple_delete=1">';
html_print_submit_button(__('Delete'), 'delete_btn',
false, 'class="sub delete"');
echo "</form>";
}
echo '<form method="post" style="float:right;" action="index.php?sec=workspace&sec2=operation/messages/message_edit">';
html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"');
echo "</form>";
echo "</div>";
echo "</td>";
echo "</tr>";
echo "</table>";
if (!empty($messages)) {
if ($show_sent) {
echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1">';
}
else {
echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list">';
}
html_print_input_hidden('multiple_delete', 1);
html_print_table($table);
echo "<div style='float: right;'>";
html_print_submit_button(__('Delete'), 'delete_btn',
false, 'class="sub delete"');
echo "</div>";
echo "</form>";
}
echo "<div style='float: right;'>";
echo '<form method="post" style="float:right;" action="index.php?sec=workspace&sec2=operation/messages/message_edit">';
html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"');
echo "</form>";
echo "</div>";
?> ?>
<script type="text/javascript"> <script type="text/javascript">
function check_all_checkboxes() { function check_all_checkboxes() {
if ($("input[name=all_delete]").attr('checked')) { if ($("input[name=all_delete]").prop('checked')) {
$(".check_delete").attr('checked', true); $(".check_delete").prop('checked', true);
} }
else { else {
$(".check_delete").attr('checked', false); $(".check_delete").prop('checked', false);
} }
} }
</script> </script>