|
|
|
@ -1,11 +1,13 @@
|
|
|
|
|
<!--add by huang-->
|
|
|
|
|
<div style="height:280px; padding-top: 10px">
|
|
|
|
|
<div style="height:280px;">
|
|
|
|
|
<div class="welcome_left">
|
|
|
|
|
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span>
|
|
|
|
|
<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
|
|
|
|
|
<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>
|
|
|
|
|
</table>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="welcome_right">
|
|
|
|
|
<%= call_hook :view_account_login_top %>
|
|
|
|
|
<table>
|
|
|
|
|
<tr>
|
|
|
|
|
<td> <%= call_hook :view_account_login_top %>
|
|
|
|
|
<div id="login-form_new">
|
|
|
|
|
<%= form_tag(signin_path) do %>
|
|
|
|
|
<%= back_url_hidden_field_tag if is_logout? %>
|
|
|
|
@ -27,31 +29,27 @@
|
|
|
|
|
<% end %>
|
|
|
|
|
<tr>
|
|
|
|
|
<td></td>
|
|
|
|
|
<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>
|
|
|
|
|
<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>
|
|
|
|
|
</tr>
|
|
|
|
|
<tr>
|
|
|
|
|
<td align="left">
|
|
|
|
|
<% if Setting.lost_password? %>
|
|
|
|
|
<td align="left"> <% if Setting.lost_password? %>
|
|
|
|
|
<%= link_to l(:label_password_lost), lost_password_path %>
|
|
|
|
|
<% end %>
|
|
|
|
|
</td>
|
|
|
|
|
<% end %> </td>
|
|
|
|
|
<td align="right">
|
|
|
|
|
<input type="submit" name="login" value="<%= l(:button_login)%> »" tabindex="5"/>
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
|
</table>
|
|
|
|
|
<% else %>
|
|
|
|
|
<!--info: modified by huang-->
|
|
|
|
|
<div>
|
|
|
|
|
<!--info-->
|
|
|
|
|
<table width="200" border="0">
|
|
|
|
|
<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>
|
|
|
|
|
</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> 
|
|
|
|
|
<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>
|
|
|
|
@ -62,18 +60,20 @@
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
|
</table>
|
|
|
|
|
<!-- end -->
|
|
|
|
|
</div>
|
|
|
|
|
<% end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
</div>
|
|
|
|
|
<%= call_hook :view_account_login_bottom %>
|
|
|
|
|
</div> <%= call_hook :view_account_login_bottom %>
|
|
|
|
|
|
|
|
|
|
<% if params[:username].present? %>
|
|
|
|
|
<%= javascript_tag "$('#password').focus();" %>
|
|
|
|
|
<% else %>
|
|
|
|
|
<%= javascript_tag "$('#username').focus();" %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<% end %> </td>
|
|
|
|
|
</tr>
|
|
|
|
|
</table>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<!--model-->
|
|
|
|
|
|
|
|
|
|
<!-- fq -->
|
|
|
|
@ -224,6 +224,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<br/><br/><br/><br/><br/><br/><br/>
|
|
|
|
|
<!-- end -->
|
|
|
|
|
<div style="padding-top: 40px"></div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|