diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index a302d0981..7b388adc4 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -15,7 +15,7 @@ <%= format_time(journal.created_on) %>
-

+

<%= journal.notes.html_safe %>

diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb index cbb5d6fc1..f7cf2a360 100644 --- a/app/views/courses/homework.html.erb +++ b/app/views/courses/homework.html.erb @@ -31,7 +31,7 @@ $(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}});
-
+
<%= bid.description.html_safe %>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 9f2fe39df..1cc117dd6 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -9,7 +9,7 @@ <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %> -
+
<%= link_to_user_header(e.event_author,false,:class => 'problem_name c_orange fl') if e.respond_to?(:event_author) %> <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>   diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index dd7db06de..1e6b9bca2 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -36,6 +36,7 @@ } .span_wping a:hover{ background-color:#03a1b3;} .span_wping_background{background: #CCC !important;} + .font_lighter_sidebar img{max-width: 100%} diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index c99c41fb9..50a97d9ba 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -30,7 +30,7 @@ :class => 'talk_edit fr' ) if @message.course_destroyable_by?(User.current) %>
-
<%= @topic.content.html_safe %>
+
<%= @topic.content.html_safe %>
<%= link_to_attachments_course @topic, :author => false %>
@@ -54,7 +54,7 @@
">
<%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %>
-
+
<%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %> <%= format_time(message.created_on) %>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index f7c5145f0..d7bec4a4f 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -31,7 +31,7 @@ :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %> <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
-
+
<%= @news.description.html_safe %>
<%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %> @@ -74,7 +74,7 @@ <%= format_time(comment.created_on) %>
-

<%= comment.comments.html_safe %>

+

<%= comment.comments.html_safe %>

<%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index cfb27e20b..a3e358b14 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -435,6 +435,9 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;} #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;} +/*上传图片处理*/ +.upload_img img{max-width: 100%;} + /* The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9.