fix table

main/admin/user_edit.php

@@ -518,11 +518,11 @@ $actions = [
     ),
 ];
 
-$content = Display::toolbarAction('toolbar-user-information', [implode(PHP_EOL, $actions)]);
+$actionBar = Display::toolbarAction('toolbar-user-information', [implode(PHP_EOL, $actions)]);
 
 $bigImage = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_BIG);
 $normalImage = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_ORIGINAL);
-$content .= '<div class="row">';
+$content = '<div class="row">';
 $content .= '<div class="col-md-10">';
 // Display form
 $content .= $form->returnForm();
@@ -532,5 +532,6 @@ $content .= '<a class="thumbnail expand-image" href="'.$bigImage.'" /><img src="
 $content .= '</div>';
 
 $tpl = new Template($tool_name);
+$tpl->assign('actions', $actionBar);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

main/attendance/attendance_sheet.php

@@ -208,7 +208,7 @@ if (api_is_allowed_to_edit(null, true) ||
         <form method="post" action="index.php?action=attendance_sheet_add&<?php echo api_get_cidreq().$param_filter; ?>&attendance_id=<?php echo $attendance_id; ?>" >
             <div class="attendance-sheet-content" style="width:100%;background-color:#E1E1E1;margin-top:20px;">
                 <div class="divTableWithFloatingHeader attendance-users-table" style="width:45%;float:left;margin:0px;padding:0px;">
-                    <table class="tableWithFloatingHeader data_table" width="100%">
+                    <table class="tableWithFloatingHeader table" width="100%">
                         <thead>
                         <tr class="tableFloatingHeader" style="position: absolute; top: 0px; left: 0px; visibility: hidden; margin:0px;padding:0px" >
                             <th width="10px"><?php echo '#'; ?></th>
@@ -260,7 +260,7 @@ if (api_is_allowed_to_edit(null, true) ||
                 <?php
 
                 echo '<div class="divTableWithFloatingHeader attendance-calendar-table" style="margin:0px;padding:0px;float:left;width:55%;overflow:auto;overflow-y:hidden;">';
-        echo '<table class="tableWithFloatingHeader data_table" width="100%">';
+        echo '<table class="tableWithFloatingHeader table" width="100%">';
         echo '<thead>';
         $result = null;
         if (count($attendant_calendar) > 0) {

src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig

@@ -43,18 +43,19 @@
             </section>
         {% endblock %}
 
-        {# Content #}
-        {% block content %}
-        <section class="container-fluid">
 
+        <section class="container-fluid">
             <div class="card mb-4">
                 <div class="card-body">
-                    {{ content }}
+                    {# Content #}
+                    {% block content %}
+                        {{ content }}
+                    {% endblock %}
                 </div>
             </div>
 
         </section>
-        {% endblock %}
+
         {% endautoescape %}
 
     </section>