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-11-28 18:31:39 +08:00
parent c74c7c44d1 c1ea53faf0
commit 929bb2bd70
4 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,13 @@
<!--add by huang--> <!--add by huang-->
<div style="height:280px; padding-top: 10px"> <div style="height:280px;">
<div class="welcome_left"> <div class="welcome_left">
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span> <table width="388px">
<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span> <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>
</div> </div>
<div class="welcome_right"> <table>
<%= call_hook :view_account_login_top %> <tr>
<td> <%= call_hook :view_account_login_top %>
<div id="login-form_new"> <div id="login-form_new">
<%= 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? %>
@ -27,31 +29,27 @@
<% end %> <% end %>
<tr> <tr>
<td></td> <td></td>
<td align="left"> <td align="left"> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <% end %> </td>
<% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
<% end %>
</td>
</tr> </tr>
<tr> <tr>
<td align="left"> <td align="left"> <% if Setting.lost_password? %>
<% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), lost_password_path %> <%= link_to l(:label_password_lost), lost_password_path %>
<% end %> <% end %> </td>
</td>
<td align="right"> <td align="right">
<input type="submit" name="login" value="<%= l(:button_login)%> &#187;" tabindex="5"/> <input type="submit" name="login" value="<%= l(:button_login)%> &#187;" tabindex="5"/>
</td> </td>
</tr> </tr>
</table> </table>
<% else %> <% else %>
<!--info: modified by huang--> <div>
<!--info-->
<table width="200" border="0"> <table width="200" border="0">
<tr> <tr>
<td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td> <td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
</tr> </tr>
<tr> <tr>
<td rowspan="2" style="padding-left: 35px"><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></td> <td rowspan="2" style="padding-left: 20px"><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></td>
<td><strong class="font_small_watch"><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %></strong>&nbsp <td><strong class="font_small_watch"><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %></strong>&nbsp
<strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %></strong></td> <strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %></strong></td>
</tr> </tr>
@ -62,18 +60,20 @@
</td> </td>
</tr> </tr>
</table> </table>
<!-- end -->
</div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div> <%= call_hook :view_account_login_bottom %>
<%= call_hook :view_account_login_bottom %>
<% if params[:username].present? %> <% if params[:username].present? %>
<%= javascript_tag "$('#password').focus();" %> <%= javascript_tag "$('#password').focus();" %>
<% else %> <% else %>
<%= javascript_tag "$('#username').focus();" %> <%= javascript_tag "$('#username').focus();" %>
<% end %> <% end %> </td>
</tr>
</table>
</div> </div>
</div>
<!--model--> <!--model-->
<!-- fq --> <!-- fq -->
@ -224,6 +224,8 @@
<br/><br/><br/><br/><br/><br/><br/> <br/><br/><br/><br/><br/><br/><br/>
<!-- end -->
<div style="padding-top: 40px"></div>

BIN
public/images/avatars/User/4246
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 762 KiB

13
public/stylesheets/application.css
View File

@ -9,16 +9,22 @@ h4, .wiki h3 {font-size: 13px;}
h4 {border-bottom: 1px dotted #bbb;} h4 {border-bottom: 1px dotted #bbb;}
/*huang*/ /*huang*/
/*current position*/ /*current position*/
div.positon-f{ div.position-f{
float: left; float: left;
width: width: 238px;
line-height: 1em;
} }
div.position-s{ div.position-s{
float: left;
width: width: 430px;
line-height: 1em;
} }
div.position-t{ div.position-t{
float: left;
width: width: 238px;
line-height: 1em;
} }
/*end current position*/ /*end current position*/
/*forums-index*/ /*forums-index*/
@ -611,6 +617,7 @@ ul.tool li{list-style-type:none;
margin-top: 70px; margin-top: 70px;
float:left; float:left;
width: 49%; width: 49%;
padding-left: 0px;
} }
.welcome_right{ .welcome_right{

2
public/stylesheets/welcome.css
View File

@ -77,7 +77,7 @@ ul {
padding: 0px; padding: 0px;
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
width: 50%; /*width: 50%;*/
} }
ul.welcome-message-list{ ul.welcome-message-list{