diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index 4c2ee0c8f..02c7ba4dc 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -9,7 +9,7 @@ <% if options[:length] %> <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%> <% else %> - <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%> + <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true, :length => 32 -%> <% end %> <%if is_float%> @@ -26,9 +26,7 @@ <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %> - ( - <%= number_to_human_size attachment.filesize %>) - + (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> <% if attachment.container_type == 'HomeworkAttach' %> <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id}, diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 6a0e79673..0ddb5913f 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -85,13 +85,13 @@ show_btn.css('width', 25); } - //close??? + //close closeBtn.bind("click",function(){ sideContent.animate({width: '0px'},"fast"); show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast"); cookiesave('minStatue','true','','',''); }); - //show??? + //show show_btn.bind("click",function() { $(this).animate({width: '0px'},"fast"); sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); diff --git a/app/views/layouts/_point_browser.html.erb b/app/views/layouts/_point_browser.html.erb index e936a6b11..3ad478928 100644 --- a/app/views/layouts/_point_browser.html.erb +++ b/app/views/layouts/_point_browser.html.erb @@ -9,38 +9,87 @@ .update{ border-bottom:1px solid #d7d7d7; color:#fea254; text-align:center; width:100%; font-size:10px; height:30px; background:#fdffd9; padding:2px 0;z-index:1000;} a.green_btn{ padding:2px 10px; background:#3caf3f; font-size:12px;color:#fff;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} a:hover.green_btn{ background:#289c2b;} - a.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px; float:right; margin:7px 5px 0 0;} - a:hover.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;} + a.update_close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px; float:right; margin:7px 5px 0 0;} + a:hover.update_close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;} +
- - + -