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

Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision

This commit is contained in:
sylor_huang@126.com 2020-03-11 20:01:07 +08:00
parent 19d070dd0c abca173def
commit 87be3432cf
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<%= hidden_field_tag 'token', @token.value %>
<!--<input type="text" class="NomalInput " value="新密码" />-->
<%= password_field_tag 'new_password', nil, :size => 25,:placeholder=>'新密码',:style=>"width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px; " %>
<p style=" color:#F00 ;margin-bottom:5px;">至少需要 6 个字符</p>
<p style=" color:#F00 ;margin-bottom:5px;">至少需要 8 个字符</p>
<!--<input type="text" class="NomalInput mb20 " value="确定密码" />-->
<%= password_field_tag 'new_password_confirmation', nil, :size => 25,:placeholder=>'确定密码',:style=>"width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;margin-bottom:20px; " %>
<div style="width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;"><a href="javascript:void(0);" style=" color:#fff;display:block !important;" onclick="$(this).parent().parent().submit();">提交</a></div>

49
app/views/layouts/new_base_user.html.erb
View File

@ -30,32 +30,33 @@
</script>
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
<% else%>
<%= render :partial => 'layouts/unlogin_header' %>
<% end%>
</div>
<div class="cl"></div>
<div class="middlePanel">
<div class="mt15">
<div class="df middlePanel">
<div class="fl pagePanel_left">
<%= render partial: "users/user_show_left" %>
</div>
<div class="fl pagePanel_right mb20">
<%= yield %>
<div class="pageContainer">
<div class="navContainer">
<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
<% else%>
<%= render :partial => 'layouts/unlogin_header' %>
<% end%>
</div>
<div class="cl"></div>
<div class="middlePanel">
<div class="mt15">
<div class="df middlePanel">
<div class="fl pagePanel_left">
<%= render partial: "users/user_show_left" %>
</div>
<div class="fl pagePanel_right mb20">
<%= yield %>
</div>
</div>
</div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
</div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
</div>
</div>
</div>
<div id="ajax-modal" style="display:none;"></div>
</body>
</html>

2
app/views/my/_apply_add_school.html.erb
View File

@ -55,7 +55,7 @@
<span class="ml2" id="provincenotice" style="color:red;" display="none"></span>
</li>
<li>
<label class="fl"><span class="c_red mr5">*</span>详细地址：</label><input id="address" type="text" class="winbox_input fl" />
<label class="fl"><span class="c_red mr5">*</span>地址：</label><input id="address" type="text" class="winbox_input fl" />
<span class="ml2" id="addressnotice" style="color:red;" display="none"></span>
</li>
<li><label class="fl">说明：</label><textarea id = "remarks" class="winbox_textarea fl" placeholder="如果您有特别需要说明的内容请填入"></textarea></li>