error display window

serghey-rodin · serghey-rodin · commit 306907270ec2 · 2013-11-02T16:42:57.000+02:00
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
@@ -19,31 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
-                        <?php
-                            if (!empty($_SESSION['backup_msg'])) {
-                        ?> 
-                        <div>
-                            <script type="text/javascript">
-                                $(function() {
-                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                    $( "#dialog-message" ).dialog({
-                                        modal: true,
-                                        buttons: {
-                                            Ok: function() {
-                                                $( this ).dialog( "close" );
-                                            }
-                                        }
-                                    });
-                                });
-                            </script>
-                            <div id="dialog-message" title="<?php print __('Backup System') ?>">
-                                <p><?php echo $_SESSION['backup_msg'] ?></p>
-                            </div>
-                        </div>
-                        <?php
-                                unset($_SESSION['backup_msg']);
-                            }
-                        ?> 
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
@@ -20,31 +20,7 @@
                             <input type="hidden" name="backup" value="<?php echo $_GET['backup'] ?>">
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
-                        <?php
-                            if (!empty($_SESSION['restore_msg'])) {
-                        ?> 
-                        <div>
-                            <script type="text/javascript">
-                                $(function() {
-                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                    $( "#dialog-message" ).dialog({
-                                        modal: true,
-                                        buttons: {
-                                            Ok: function() {
-                                                $( this ).dialog( "close" );
-                                            }
-                                        }
-                                    });
-                                });
-                            </script>
-                            <div id="dialog-message" title="<?php print __('Backup System') ?>">
-                                <p><?php echo $_SESSION['restore_msg'] ?></p>
-                            </div>
-                        </div>
-                        <?php
-                                unset($_SESSION['restore_msg']);
-                            }
-                        ?> 
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
@@ -21,6 +21,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
@@ -21,6 +21,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
@@ -21,6 +21,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
@@ -21,6 +21,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
@@ -20,31 +20,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
-                        <?php
-                            if (!empty($_SESSION['error_msg'])) {
-                        ?> 
-                        <div>
-                            <script type="text/javascript">
-                                $(function() {
-                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                    $( "#dialog-message" ).dialog({
-                                        modal: true,
-                                        buttons: {
-                                            Ok: function() {
-                                                $( this ).dialog( "close" );
-                                            }
-                                        }
-                                    });
-                                });
-                            </script>
-                            <div id="dialog-message" title="Error">
-                                <p><?php echo $_SESSION['error_msg'] ?></p>
-                            </div>
-                        </div>
-                        <?php
-                                unset($_SESSION['error_msg']);
-                            }
-                        ?> 
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
@@ -7,6 +7,7 @@
                             <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
@@ -21,6 +21,7 @@
                                 </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
@@ -21,6 +21,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
@@ -13,6 +13,7 @@
                             <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
@@ -10,6 +10,7 @@
                             <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
@@ -18,31 +18,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
-                        <?php
-                            if (!empty($_SESSION['error_srv'])) {
-                        ?> 
-                        <div>
-                            <script type="text/javascript">
-                                $(function() {
-                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                    $( "#dialog-message" ).dialog({
-                                        modal: true,
-                                        buttons: {
-                                            Ok: function() {
-                                                $( this ).dialog( "close" );
-                                            }
-                                        }
-                                    });
-                                });
-                            </script>
-                            <div id="dialog-message" title="">
-                                <p><?php echo $_SESSION['error_srv'] ?></p>
-                            </div>
-                        </div>
-                        <?php
-                                unset($_SESSION['error_srv']);
-                            }
-                        ?> 
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
@@ -24,6 +24,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html
@@ -16,31 +16,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
-                        <?php
-                            if (!empty($_SESSION['error_upd'])) {
-                        ?> 
-                        <div>
-                            <script type="text/javascript">
-                                $(function() {
-                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                    $( "#dialog-message" ).dialog({
-                                        modal: true,
-                                        buttons: {
-                                            Ok: function() {
-                                                $( this ).dialog( "close" );
-                                            }
-                                        }
-                                    });
-                                });
-                            </script>
-                            <div id="dialog-message" title="Error">
-                                <p><?php echo $_SESSION['error_upd'] ?></p>
-                            </div>
-                        </div>
-                        <?php
-                                unset($_SESSION['error_upd']);
-                            }
-                        ?> 
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
@@ -34,6 +34,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
@@ -21,6 +21,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
@@ -10,6 +10,7 @@
                                 <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
@@ -7,6 +7,7 @@
                             <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
@@ -19,6 +19,7 @@
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
+                        <?php display_error_block(); ?> 
                     </td>
                 </tr>
             </table>
