merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -0,0 +1,18 @@
<style type="text/css">
.sorry{width:50%;margin:2em auto;padding:2em 3em;border:4px solid #444;font-family:Tahoma, Geneva, sans-serif;background:#666;border-radius:10px;box-shadow:0 0 10px #999;overflow:hidden}
.sorry .hx{float:left;margin:0 20px 0 0;color:#fff}
.sorry .msg{float:left;border-left:1px solid #fff;padding:0 0 0 20px;color:#eee}
.sorry h1{font-size:32px;margin:0;white-space:nowrap}
.sorry p{font-size:16px;line-height:1.5;margin:0}
@media only all and (max-width:480px){
.sorry{width:auto}
}
</style>
<div class="sorry">
<h1 class="hx">Sorry!</h1>
<div class="msg">
<h1>{$http_status_code}</h1>
<p>{$http_status_message}</p><br />
<p>{$system_message}</p>
</div>
</div>