diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 7b7f4a536..fc3582c40 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -31,7 +31,7 @@
- <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %> + <%= image_tag(url_to_avatar(@user),width:"90", height: "90", :id=>'nh_user_tx') %> <% if User.current.logged?%> <% if is_current_user%>
@@ -46,15 +46,15 @@ <% end %> <% end%>
-
-
+ <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> <% end %>
-

教授

+

教授

<%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%> diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 19a5d89d2..b86f55385 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -1,11 +1,11 @@
-
+
用户头像
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）
提交（10）
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 88a00e8ab..10bbe4bdf 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index a72eac345..90d5d05ee 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（留言）
提交（10）
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 54a7b3c17..13e6df408 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）
提交（10）
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index 1d6943be1..b2487c444 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目创建）
提交（10）
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index 6e58552de..4f5d986d7 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）
提交（10）
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 7833d8675..3c1f8c61d 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）
提交（10）
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb index ea39cbae5..9e4dfaf24 100644 --- a/app/views/users/_project_news.html.erb +++ b/app/views/users/_project_news.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目新闻）
提交（10）
diff --git a/app/views/users/show_chen.erb b/app/views/users/show_chen.erb index 74b303fad..950350202 100644 --- a/app/views/users/show_chen.erb +++ b/app/views/users/show_chen.erb @@ -29,9 +29,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）
提交（10）
@@ -58,9 +58,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）
提交（10）
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a56087017..e432a8f48 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -496,13 +496,13 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;} .homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;} -.homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;} +.homepagePortraitImage {width:90px; height:90px; position:relative; border:1px solid #cbcbcb; padding: 2px;} .homepagePortraitImage:hover {border:1px solid #269ac9;} .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageEditProfile {width:16px; height:16px; border-radius:2px; background-color:#888888; position:absolute; right:5px; bottom:5px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;} .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -14px -37px no-repeat; width:20px; height:20px; display:block;} -.homepageImageName {font-size:16px; color:#484848; margin-right:5px; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;} +.homepageImageName {font-size:16px; color:#484848; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;} .homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;} a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;}