Merge branch '6660-fix-colspan' into 'develop'

Fix amount of colspan in two list views

Closes #6660

See merge request ispconfig/ispconfig3!1861

Author: Till Brehm

interface/web/admin/templates/server_list.htm

@@ -51,16 +51,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="9">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="7"><tmpl_var name="paging"></td>
+                        <td colspan="9"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>
 </div>
-        
-    </div>
+
+    </div>

interface/web/admin/templates/server_php_list.htm

@@ -4,12 +4,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
 
         <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-            
+
                 <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/server_php_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-            
-        
 
-    
+
+
+
         <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
             <div class="table-wrapper marginTop15">
 <table class="table">
@@ -50,16 +50,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="6"><tmpl_var name="paging"></td>
+                        <td colspan="7"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>
 </div>
-        
-    
+
+

interface/web/mail/templates/backup_stats_list.htm

@@ -31,12 +31,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
 				</tbody>
 				<tfoot>
 					<tr>
-						<td colspan="5">
+						<td colspan="6">
 							<tmpl_var name="paging">
 						</td>
 					</tr>
 				</tfoot>
             </table>
 </div>
-        
+
     </div>

interface/web/mail/templates/mail_user_list.htm

@@ -80,13 +80,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
                 </tmpl_loop>
                 <tmpl_unless name="records">
                     <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                        <td colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                        <td colspan="<tmpl_if name="enable_custom_login">10<tmpl_else>9</tmpl_if>">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                     </tr>
                 </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>"><tmpl_var name="paging"></td>
+                        <td colspan="<tmpl_if name="enable_custom_login">10<tmpl_else>9</tmpl_if>"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>

interface/web/sites/templates/backup_stats_list.htm

@@ -31,12 +31,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
 				</tbody>
 				<tfoot>
 					<tr>
-						<td colspan="5">
+						<td colspan="6">
 							<tmpl_var name="paging">
 						</td>
 					</tr>
 				</tfoot>
             </table>
 </div>
-        
+
     </div>

interface/web/sites/templates/user_quota_stats_list.htm

@@ -47,16 +47,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="8">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="7"><tmpl_var name="paging"></td>
+                        <td colspan="8"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>
 </div>
-        
+
     </div>