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

登录界面base及新页面

This commit is contained in:
huang 2016-06-15 15:41:13 +08:00
parent d75a8bc35a
commit a2c5cc6da1
6 changed files with 177 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,6 +201,40 @@
}
}
</script>
<div class="new_login">
<div class="new_login_con">
<div class="new_login_txt fl">
<h3> 欢迎加入Trustie创新实践社区</h3>
<p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
</div>
<div class="new_login_box fr mr45 mt100">
<h2 class="new_login_h2">登录<a href="register.html" class="fr mt5">立即注册</a><div class="cl"></div></h2>
<div class="new_login_form">
<form>
<ul>
<li>
<input type="text" class="new_loggin_input new_login_users" placeholder="请输入邮箱地址或登录名">
<p class="new_login_error" >请输入正确的邮箱或登录名</p>
</li>
<li>
<input type="text" class="new_loggin_input new_login_lock" placeholder="请输入登录密码">
<p class="new_login_error" style="display:none;">请输入位密码，区分大小写，不能使用空格！</p>
</li>
<li>
<label><input type="checkbox" checked=" checked" class=" new_login_check">记住密码</label>
<a href="javascript:void(0);" class="fr">忘记密码</a><div class="cl"></div>
</li>
<li><button type="submit" class="new_login_submit">登录</button></li>
</ul>
</form>
</div>
</div>
<div class="cl"></div>
</div>
</div>
<div class="loginContentContainer">
<div class="loginContent">
<div class="loginLeft">

18
app/views/layouts/login.html.erb
View File

@ -9,24 +9,11 @@
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user"%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
<!-- MathJax的配置 -->
<script type="text/javascript"
src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
</script>
<!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
showMathMenu: false,
showMathMenuMSIE: false,
tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
});
</script>
</head>
<body>
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
@ -35,9 +22,10 @@
<%= render :partial => 'layouts/unlogin_header' %>
<% end%>
</div>
<%= yield %>
<div class="cl"></div>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user"%>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
<%= call_hook :view_layouts_base_body_bottom %>

BIN
public/images/login/bg_login.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
public/images/login/bg_register.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
public/images/login/icons_login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

144
public/stylesheets/new_user.css
View File

@ -537,10 +537,10 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
/*新个人主页框架css*/
.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
.navContainer {width:100%; margin:0 auto; background-color:#1065bd;}
.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
.navHomepageMenu:hover {background-color:#297fb8;}
@ -751,8 +751,8 @@ a:hover .gz_btn{color:#ff5722;}
#signUpBox {display:none; margin-top:79px;}
#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
#loginSignButton:hover {background-color:#297fb8;}
#loginInButton:hover {background-color:#297fb8;}
#loginSignButton:hover {background-color:#05488e;}
#loginInButton:hover {background-color:#05488e;}
.loginContentContainer {width:100%; background-color:#269ac9; margin-top:1px; height:580px;}
.loginContent {width:1000px; margin:0px auto;}
.loginLeft {width:595px; float:left;}
@ -1628,3 +1628,139 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
span.shadowbox_news_user{ color:#3b94d6;}
a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
/* 新版登录注册 */
.mr45{ margin-right:45px;}
.mt100{ margin-top:100px;}
.mt50{ margin-top:50px;}
.new_login{
width:100%;
height:524px;
background-color:#1065bd;
}
.new_login_con{
width:1000px;
height:524px;
margin:0 auto;
background:url(../images/login/bg_login.jpg) 0 0 no-repeat;
}
.new_login_box{
background:#FFF;
width:265px;
padding:20px 15px;
-webkit-border-radius:5px;
-moz-border-radius:5px;
-o-border-radius:5px;
border-radius:5px;
background-color: rgba(255,255,255,0.3);
}
.new_login_h2{
font-size:18px;
color:#fff;
border-bottom:1px solid #fff;
font-weight:normal;
padding-bottom:5px;
margin-bottom:30px;
}
.new_login_h2 a{
font-size:12px;
color:#fff;
background:url(../images/login/icons_login.png) 0 -69px no-repeat;
padding-left:10px;
}
input.new_loggin_input{
width:250px;
height:45px;
background:#fff;
-webkit-border-radius:5px;
-moz-border-radius:5px;
-o-border-radius:5px;
border-radius:5px;
border:none;
padding-left:15px;
margin-bottom:2px;
}
input.new_login_users{
background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
width:215px;
height:45px;
-webkit-border-radius:5px;
-moz-border-radius:5px;
-o-border-radius:5px;
border-radius:5px;
border:none;
padding-left:50px;
margin-bottom:2px;
}
input.new_login_lock{
background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
width:215px;
height:45px;
-webkit-border-radius:5px;
-moz-border-radius:5px;
-o-border-radius:5px;
border-radius:5px;
border:none;
padding-left:50px;
margin-bottom:2px;
}
.new_login_form ul li{
margin-bottom:15px;
}
.new_login_error{
color:#fff;
}
.new_login_submit{
width:265px;
height:40px;
background:#f27d0d;
color:#fff;
font-size:14px;
-webkit-border-radius:5px;
-moz-border-radius:5px;
-o-border-radius:5px;
border-radius:5px;
border:none;
text-align:center;
cursor:pointer;
}
.new_login_check{
width:15px;
height:15px;
border:1px solid #fff;
border-style:none;
margin-right:5px;
vertical-align: -2px;
}
.new_login_form label{ color:#fff;}
.new_login_form a{ color:#fff; text-decoration:underline;}
.new_register{
width:100%;
height:580px;
background-color:#1065bd;
}
.new_register_con{
width:1000px;
height:580px;
margin:0 auto;
background:url(../images/login/bg_register.jpg) 0 0 no-repeat;
}
.new_login_txt{
width:282px;
height:140px;
padding:30px 12px 0;
color:#fff;
margin:235px 0 0 165px;
}
.new_login_txt h3{
font-size:18px;
text-align:center;
margin-bottom:20px;
}
.new_login_txt p{
line-height:2.0;
}
.new_register_left{
margin-top:250px;
}