fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-22 20:59:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

18
modules/message/m.skins/default/http_status_code.html Normal file
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>

2
modules/message/skins/default/http_status_code.html
View file

@ -5,7 +5,7 @@
.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:80%}
.sorry{width:auto}
}
</style>
<div class="sorry">

4
modules/message/skins/default/message.css
View file

@ -7,8 +7,8 @@
#loginAccess ul{margin:0;padding:0;list-style:none}
#loginAccess .idpw{margin:0 28px 20px 28px}
#loginAccess .idpw li{margin:0 0 5px 0}
#loginAccess .inputText{font-size:12px;height:22px;color:#767676;font-weight:bold;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1}
#loginAccess .idpw .inputText{width:316px;padding:8px 0 0 10px}
#loginAccess .iText{font-size:12px;height:22px;color:#767676;font-weight:bold;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1}
#loginAccess .idpw .iText{width:316px;padding:8px 0 0 10px}
#loginAccess .inputCheck{width:13px;height:13px;margin:0;padding:0;vertical-align:middle}
#loginAccess label{vertical-align:middle}
#loginAccess #warning{display:none;margin:0 0 20px 0}

4
modules/message/skins/default/message.js
View file

@ -11,7 +11,7 @@ function completeMessageOpenIDLogin(ret_obj, response_tags) {
}
function doLogin(o,filter){
jQuery('input.inputText',o).each(function(){
jQuery('input.iText',o).each(function(){
var t = jQuery(this);
if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
});
@ -22,7 +22,7 @@ function doLogin(o,filter){
function initLoginTitleMsg(){
jQuery('.gLogin, .mLogin').find('input.inputText').focus(function(){
jQuery('.gLogin, .mLogin').find('input.iText').focus(function(){
var t = jQuery(this);
if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
}).blur(function(){

6
modules/message/skins/default/system_message.html
View file

@ -14,8 +14,8 @@
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset>
<ul class="idpw">
<li><input type="text" name="user_id" id="uid" value="" class="inputText" title="{$lang->user_id}" /></li>
<li><input type="password" name="password" id="upw" value="" class="inputText" title="{$lang->password}" /></li>
<li><input type="text" name="user_id" id="uid" value="" class="iText" title="{$lang->user_id}" /></li>
<li><input type="password" name="password" id="upw" value="" class="iText" title="{$lang->password}" /></li>
</ul>
<div class="buttonArea">
<p class="keeping">
@ -38,6 +38,6 @@
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
</div>
<div class="logOut" cond="!$is_logged && $module != 'admin'">
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}</a></span>
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}...</a></span>
</div>
</div>