jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_bigdata' into dev_shixun_project

This commit is contained in:
cxt 2017-04-01 11:00:31 +08:00
parent 5efb8c0004 5716a9b2b6
commit 5ad25dcc9c
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/account/login.html.erb
View File

@ -58,7 +58,7 @@
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" onclick="loginin();" class ="new_login_submit" id="login_btn" style="text-decoration:none">登录</a>
<button type="submit" class ="new_login_submit"><a href="javascript:void(0);" onclick="loginin();" id="login_btn" style="text-decoration:none;">登录</a></button>
</li>
</ul>
<% end %>

14
app/views/account/user_join.html.erb
View File

@ -65,7 +65,7 @@
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" id="regist_btn_phone" onclick="phone_register();" class ="new_login_submit" style="text-decoration:none;">注册</a>
<a href="javascript:void(0);" id="regist_btn_phone" onclick="phone_register();" class ="new_login_submit" style="text-decoration:none; color: #fff;">注册</a>
</li>
</ul>
<% end %>
@ -105,7 +105,7 @@
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" id="regist_btn_email" onclick="email_register();" class ="new_login_submit" style="text-decoration:none;">注册</a>
<a href="javascript:void(0);" id="regist_btn_email" onclick="email_register();" class ="new_login_submit" style="text-decoration:none; color: #fff;">注册</a>
</li>
</ul>
<% end %>
@ -117,6 +117,16 @@
</div>
<script type="text/javascript">
document.onkeydown=function(event){
e = event ? event :(window.event ? window.event : null);
if(e.keyCode==13){
if($("#login_weixin_content_1").is(":visible")){
phone_register();
} else{
email_register();
}
}
};
$('#drag').drag();
function g(o){
return document.getElementById(o);

2
app/views/layouts/_logined_header.html.erb
View File

@ -25,7 +25,7 @@
<ul class="fr inner-nav-mes" id="user_messages">
<li>
<i class="icon-bell-alt " onclick="window.location.href='<%= user_path(User.current) %>'" style="cursor: pointer;"></i>
<i class="fa fa-bell" onclick="window.location.href='<%= user_path(User.current) %>'" style="cursor: pointer;"></i>
<% new_message_count = User.current.count_new_message.to_i %>
<% if new_message_count > 0 %>
<span class="inner-nav-cir"><%= new_message_count %></span>

7
public/stylesheets/css/bigdata-common.css
View File

@ -82,9 +82,10 @@ a:hover.task-btn-ver-line{ border:1px solid #29bd8b;}
a:hover.task-btn-ver{background:#5f7cab;}
a.rest-btn-ver{ background: #969696; color: #fff; cursor: not-allowed}
a:hover.rest-btn-ver{ background: #969696;}
.new_login_submit_disable{ width:265px; height:40px; line-height: 40px; background:#ccc; color:#fff; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
a.new_login_submit{ display: inline-block; width:100%; height:45px; line-height: 45px; background:#29bd8b; color:#fff; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
a.new_login_submit:hover{background: #19b17e;}
.new_login_submit_disable{ width:265px; height:40px; line-height: 40px; background:#ccc; color:#fff !important; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
.new_login_submit{ display: inline-block; width:100%; height:45px; line-height: 45px; background:#29bd8b; color:#fff !important; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
.new_login_submit:hover{background: #19b17e;}
.new_login_submit a{ color: #fff;}
/*提示条*/
.alert{ padding:10px;border: 1px solid transparent; text-align: center;}
.alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;}