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

课程新编辑器导致图片超出页面

This commit is contained in:
sw 2015-04-10 15:43:37 +08:00
parent ea0bd7e0dd
commit 400d1a147d
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/courses/_history.html.erb
View File

@ -15,7 +15,7 @@
<%= format_time(journal.created_on) %> <%= format_time(journal.created_on) %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
<p> <p class="upload_img">
<%= journal.notes.html_safe %> <%= journal.notes.html_safe %>
</p> </p>
</div> </div>

2
app/views/courses/homework.html.erb
View File

@ -31,7 +31,7 @@
$(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}}); $(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}});
</script> </script>
<div id="bid_description_<%= bid.id%>" class="news_description mt5"> <div id="bid_description_<%= bid.id%>" class="news_description mt5">
<div id="bid_description_<%= bid.id%>_content"> <div id="bid_description_<%= bid.id%>_content" class="upload_img">
<%= bid.description.html_safe %> <%= bid.description.html_safe %>
</div> </div>
</div> </div>

2
app/views/courses/show.html.erb
View File

@ -9,7 +9,7 @@
<a class="problem_pic fl"> <a class="problem_pic fl">
<%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %> <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %>
</a> </a>
<div class="problem_txt fl mt5"> <div class="problem_txt fl mt5 upload_img">
<%= 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,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) %> <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>
<span class="fl"> &nbsp;</span> <span class="fl"> &nbsp;</span>

1
app/views/layouts/base_homework.html.erb
View File

@ -36,6 +36,7 @@
} }
.span_wping a:hover{ background-color:#03a1b3;} .span_wping a:hover{ background-color:#03a1b3;}
.span_wping_background{background: #CCC !important;} .span_wping_background{background: #CCC !important;}
.font_lighter_sidebar img{max-width: 100%}
</style> </style>
</head> </head>
<body class="<%= h body_css_classes %>"> <body class="<%= h body_css_classes %>">

4
app/views/messages/_course_show.html.erb
View File

@ -30,7 +30,7 @@
:class => 'talk_edit fr' :class => 'talk_edit fr'
) if @message.course_destroyable_by?(User.current) %> ) if @message.course_destroyable_by?(User.current) %>
<div class="cl"></div> <div class="cl"></div>
<div class="talk_info mb10"><%= @topic.content.html_safe %></div> <div class="talk_info mb10 upload_img"><%= @topic.content.html_safe %></div>
<div class="talk_info mb10"><%= link_to_attachments_course @topic, :author => false %></div> <div class="talk_info mb10"><%= link_to_attachments_course @topic, :author => false %></div>
<!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>--> <!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>-->
<div class="cl"></div> <div class="cl"></div>
@ -54,7 +54,7 @@
<div class="ping_C mb10" id="<%= "message-#{message.id}" %>"> <div class="ping_C mb10" id="<%= "message-#{message.id}" %>">
<div class="ping_dispic"><%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %></div> <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %></div>
<div class="ping_discon"> <div class="ping_discon">
<div class="ping_distop"> <div class="ping_distop upload_img">
<%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %> <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %>
<span class="c_grey fr"><%= format_time(message.created_on) %></span> <span class="c_grey fr"><%= format_time(message.created_on) %></span>
<div class="cl"></div> <div class="cl"></div>

4
app/views/news/_course_show.html.erb
View File

@ -31,7 +31,7 @@
:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %> :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) %> <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
<div class="cl"></div> <div class="cl"></div>
<div class="mb5"> <div class="mb5 upload_img">
<%= @news.description.html_safe %> <%= @news.description.html_safe %>
<br /> <br />
<%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %> <%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %>
@ -74,7 +74,7 @@
<%= format_time(comment.created_on) %> <%= format_time(comment.created_on) %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
<p><%= comment.comments.html_safe %></p> <p class="upload_img"><%= comment.comments.html_safe %></p>
</div> </div>
<div class="ping_disfoot"> <div class="ping_disfoot">
<%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},

3
public/stylesheets/courses.css
View File

@ -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;} #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
#cboxClose{position:absolute; bottom:0; right:0; display:block; 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 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. when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9.