From fedc12573159c1580d4bac03cfac41a05ab366c6 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 14:13:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=9C=A8=E5=8F=AF=E7=94=A8=E7=9A=84=E8=8C=83=E5=9B=B4=E5=86=85?= =?UTF-8?q?=E5=B0=BD=E5=8F=AF=E8=83=BD=E6=98=BE=E7=A4=BA=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_project_issue.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 4badcff42..351ca3dfe 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -34,7 +34,7 @@ <% activity.attachments.each do |attachment| %>
- <%= link_to_short_attachment attachment, :class => 'homepagePostFileAtt newsBlue', :download => true -%> + <%= link_to_short_attachment attachment,:length=> 58, :class => 'homepagePostFileAtt newsBlue', :download => true -%> <% if attachment.is_text? %> <%= link_to image_tag('magnifier.png'), From 23c1ac5a4a4c2c289be0e0158b83a260e0c7cac2 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 14:28:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_project_issue.html.erb | 7 ++++++- public/stylesheets/new_user.css | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 351ca3dfe..8c374d2d7 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -28,7 +28,12 @@
时间：<%=format_date(activity.created_on) %>
-
缺陷描述：<%= activity.description.html_safe %>
+
缺陷描述： + <% if activity.description? %> + <%= textAreailizable activity, :description, :attachments => activity.attachments %> + <% end %> + <%#= activity.description.html_safe %> +
<% if activity.attachments.any? %> <% activity.attachments.each do |attachment| %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 357cfff6b..d3ae2a18b 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -953,7 +953,7 @@ img.ui-datepicker-trigger { .is_public_checkbox{display: none !important;} .is_public{display: none !important;} .ui-corner-left{background: #64bdd9;} - +.homepagePostIntro img{max-width: 100%;} From b0ff7f0ee23c943c444f9d79cf1256b467a4f258 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Mon, 31 Aug 2015 14:52:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A4=B4=E5=83=8F=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 6 ++-- app/views/users/_course_attachment.html.erb | 8 ++--- app/views/users/_course_create.html.erb | 8 ++--- app/views/users/_course_homework.html.erb | 8 ++--- .../users/_course_journalsformessage.html.erb | 8 ++--- app/views/users/_course_message.html.erb | 12 ++++---- app/views/users/_course_news.html.erb | 12 ++++---- app/views/users/_course_poll.html.erb | 10 +++---- app/views/users/_project_attachment.html.erb | 8 ++--- app/views/users/_project_create.html.erb | 8 ++--- app/views/users/_project_document.html.erb | 8 ++--- app/views/users/_project_issue.html.erb | 8 ++--- app/views/users/_project_journal.html.erb | 8 ++--- app/views/users/_project_message.html.erb | 12 ++++---- app/views/users/_project_news.html.erb | 8 ++--- app/views/users/_user_homework_list.html.erb | 2 +- app/views/users/show_chen.erb | 28 +++++++++--------- public/stylesheets/courses.css | 14 ++++----- public/stylesheets/new_user.css | 29 ++++++++++--------- 19 files changed, 103 insertions(+), 102 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 32813b58d..890fadbed 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:"90", height: "90", :id=>'nh_user_tx') %> + <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %> <% if User.current.logged?%> <% if is_current_user%>
@@ -43,14 +43,14 @@ <% end%>
- <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> <% end %>
-

+

<%= get_technical_title @user %>

diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index e0d04548b..41961f05b 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -1,11 +1,11 @@
-
+
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -15,7 +15,7 @@ <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%=activity.filename.to_s(附件名称)%>
diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index b86f55385..b69e6ee86 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -1,11 +1,11 @@
-
+
- 用户头像
+ 用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）
提交（10）
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index a3d4992c5..accf285ed 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -1,10 +1,10 @@
-
+
- <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), 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 90d5d05ee..12c082dfa 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -1,11 +1,11 @@
-
+
- 用户头像
+ 用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（留言）
提交（10）
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 05caa1f91..814d94af5 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -1,10 +1,10 @@
-
+
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -14,15 +14,15 @@ <%= link_to activity.course.name.to_s+" | 课程讨论区", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
-
+
<% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
-
-
发帖时间：<%= format_date(activity.created_on) %>
+
+ 发帖时间：<%= format_date(activity.created_on) %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index dbeb8d450..d6c32def6 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -1,10 +1,10 @@
-
+
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -12,11 +12,11 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
-
+
<%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
-
-
发布时间：<%= format_date(activity.created_on) %>
+
+ 发布时间：<%= format_date(activity.created_on) %>
通知描述：<%= activity.description.html_safe %>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 97b3b759d..7aafb5451 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -1,13 +1,13 @@ <% has_commit = has_commit_poll?(activity.id ,User.current)%> <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
-
+
- <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), 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 %> @@ -25,8 +25,8 @@ <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%> <% end %>
-
-
发布时间：<%= format_date(activity.published_at) %>
+
+ 发布时间：<%= format_date(activity.published_at) %>
问卷描述：<%=activity.polls_description.html_safe.to_s%>