← Back to branch summary

~fabiocbalbuquerque/sahana-agasti/web-services

« back to all changes in this revision

Viewing changes to apps/frontend/config/error/error.html.php

  • Committer: Fabio Albuquerque
  • Date: 2011-08-08 22:10:34 UTC
  • mfrom: (1.26.1 push-trunk)
  • Revision ID: fabiocbalbuquerque@gmail.com-20110808221034-vfr4ggsbxsdllq82
Merges from CUNY SPS

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/frontend/config/error/error.html.php
15
15
    <title>Sahana Agasti, Mayon 2.0</title>
16
16
    <link rel="shortcut icon" href="<?php echo public_path('images/favicon.ico'); ?>" />
17
17
    <?php echo stylesheet_tag('agMain'); ?>
 
18
    <?php echo stylesheet_tag('agMenu'); ?>
18
19
    <!--[if lte IE 6]>
19
20
    <?php echo stylesheet_tag('lte_ie6_css'); ?>
20
21
    <![endif]-->
32
33
    <div id="wrapper">
33
34
      <div id="navigation">
34
35
      </div>
 
36
<<<<<<< TREE
35
37
        <br/> <?php echo $_SERVER['REQUEST_URI'] ?>
 
38
=======
 
39
      <div id="columns">
 
40
        <!--Error occured on page -->
 
41
        <!--<br/> <?php echo $_SERVER['REQUEST_URI'] ?> -->
 
42
>>>>>>> MERGE-SOURCE
36
43
        <h2> New York City Sahana Agasti</h2>
37
44
        <br/>
38
45
        <h5>The server returned a "<?php echo $code ?> <?php echo $text ?>".</h5>
39
46
        <br/>
40
47
        <h4>
41
 
          <?php echo $exception->getmessage(); ?>
 
48
          <?php preg_match('SQLSTATE',$exception->getmessage()) ?>
 
49
          <?php $exception_message = preg_match("/SQLSTATE/i",$exception)? "Error related to MYSQL Database. Please click 'Back' button to continue." : $exception->getmessage(); ?>
 
50
          <?php echo $exception_message; ?>
 
51
        <!--An error occured on server. Please click 'Back' button to reload the page.-->
42
52
        </h4>
43
53
        <br/>
44
54
        <br/>