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

fix bugs

This commit is contained in:
yanxd 2014-01-22 09:22:12 +08:00
parent 6b53ebadaf
commit c541865fa3
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/base.html.erb
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="<%= current_language %>">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title><%=h html_title %></title> <title><%=h html_title %></title>

2
app/views/layouts/base_users.html.erb
View File

@ -55,7 +55,7 @@
<td> <td>
<table> <table>
<tr> <tr>
<td class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><%= h @user.lastname<<@user.firstname %> <!-- added by bai --> <td class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><%= h (@user.lastname+@user.firstname) %> <!-- added by bai -->
<%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%></td> <%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%></td>
</tr> </tr>
<tr> <tr>

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

@ -41,7 +41,7 @@
<div> <div>
<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: 20px"><%= 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>

1
config/locales/en.yml
View File

@ -1535,6 +1535,7 @@ en:
label_teacher_work_unit: Position label_teacher_work_unit: Position
label_course_overview: Status label_course_overview: Status
label_course_file: File label_course_file: File
label_stores_index: Resource search
label_course_news: News label_course_news: News
label_x_base_courses_member: label_x_base_courses_member: