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

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2013-12-05 17:15:39 +08:00
parent 7e479c33e4 04f42fc2e5
commit 2a6288dfa5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/welcome_helper.rb
View File

@ -201,5 +201,4 @@ module WelcomeHelper
end end
end end
end end

6
app/views/welcome/index.html.erb
View File

@ -1,6 +1,6 @@
<!--add by huang--> <!--add by huang-->
<div style="height:280px;"> <div style="height:220px;">
<div class="welcome_left"> <div class="welcome_left" style="margin-top: 60px">
<table width="388px"> <table width="388px">
<tr><td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td></tr> <tr><td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td></tr>
</table> </table>
@ -8,7 +8,7 @@
<table> <table>
<tr> <tr>
<td> <%= call_hook :view_account_login_top %> <td> <%= call_hook :view_account_login_top %>
<div id="login-form_new"> <div id="login-form_new" style="margin-top: -20px;">
<%= form_tag(signin_path) do %> <%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag if is_logout? %> <%= back_url_hidden_field_tag if is_logout? %>
<% unless User.current.logged? %> <!--modified by young--> <% unless User.current.logged? %> <!--modified by young-->