From 41a6b8ab0614ed0c467d336de0111f8be589de70 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 14:35:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_attachments_links.html.erb | 34 ++------------------- app/views/memos/show.html.erb | 2 +- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 967bc0883..ca0f41d16 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -1,4 +1,4 @@ -
+
<% for attachment in attachments %> @@ -20,43 +20,13 @@
<% else %> - <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%> + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%> (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> - <%#= link_to image_tag('delete.png'), attachment_path(attachment), - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :class => 'delete', - #:remote => true, - #:id => "attachments_" + attachment.id.to_s, - :title => l(:button_delete) %> <% end %>
<% end %> - - <%# if attachment.is_text? %> - <%#= link_to image_tag('magnifier.png'), - :controller => 'attachments', - :action => 'show', - :id => attachment, - :filename => attachment.filename%> - <%# end %> - - - - - - - - - - - <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %> - - - - <% end %> <% if defined?(thumbnails) && thumbnails %> <% images = attachments.select(&:thumbnailable?) %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 1e2f0f25b..550c7a4fe 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -69,7 +69,7 @@ <%= @memo.content.html_safe%>
-
+
<% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> From b58fcb58de67bb5ce18541037283cc69cd5c3fcf Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 14:45:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0=EF=BC=9B=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 95 ++++++++------------------ 1 file changed, 28 insertions(+), 67 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 93969f71b..63876084d 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -127,7 +127,7 @@ :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
  •    截止时间快到了！
    • @@ -240,14 +215,13 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -267,14 +241,11 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -296,13 +267,12 @@ :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -386,13 +356,8 @@ :onmouseout => "message_titile_hide($(this))" %> <% end %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -437,16 +402,12 @@ :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • From eac31cda7f0e75ae91ae679574c319f728fd6eae Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 15:13:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E7=95=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index b2001e465..f56512fb9 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -168,6 +168,7 @@ a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px s a:hover.problem_pic{border:1px solid #64bdd9;} .issues_icon{ background:url(../images/public_icon.png) 0 -342px no-repeat; width:16px; height:21px;} .problem_txt{ width:600px; margin-left:10px; color:#777777; } +.problem_txt img {max-width:100%;} .pro_txt_w{width:610px;} a.problem_name{ color:#ff5722;max-width: 80px; overflow: hidden; From 038bcdb80e8333d8b4da9594e04723c14a881573 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 28 Sep 2015 15:24:03 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=BC=96=E8=BE=91=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 4fd8d99d2..abf0bd628 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -139,7 +139,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} -a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} +a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} .homepagePostReplyPortrait {float:left; width:33px;} .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;} .homepagePostReplyDes {float:left; width:632px; margin-left:15px;} @@ -980,6 +980,4 @@ a:hover.c_grey{ color:#333;} .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .last_time{width:auto; text-align:right; margin-right:70px;} .link_file_box{ width:360px;} -a.postOptionLink{float: right;color: #64bdd9;display: block;padding: 1px 5px;border: 1px solid #64bdd9;width: initial;} -a:hover.postOptionLink {color: #fff;background: #64bdd9;} From e9d61a928a1b60364d84284dc1397d46d471154e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 16:08:47 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AEissue?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E8=BE=B9=E7=95=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/journals_helper.rb | 2 +- public/stylesheets/project.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 1a0b9ca0d..3591a0168 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -119,7 +119,7 @@ module JournalsHelper content << textAreailizable(journal, :notes) css_classes = "wiki" css_classes << " editable" if editable - content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px") + content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes) end def link_to_in_place_notes_editor(text, field_id, url, options={}) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index f56512fb9..2806a1dbe 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -221,6 +221,7 @@ a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;} +.talk_info img {max-width:100%;} a.talk_edit{ color:#426e9a; margin-right:5px;} a:hover.talk_edit{ color:#ff5722;} .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} @@ -877,4 +878,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} /*version*/ .time_tracter{color: #64BDD9;padding: 5px;} +.wiki {width: 510px;} +.wiki img {max-width:100%;} From 955d87a98c3b9d04b9da49fa35401f741f382004 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 28 Sep 2015 16:09:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=9B=86=E7=9A=84=E7=BC=96=E8=BE=91=E6=A1=86=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/homework.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index ad3ad02fe..f1b6e1814 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -184,6 +184,14 @@ $(function(){ $("#BluePopupBox").on('click', 'a.icon_add', function(){ var html = bt('t:test-answer-list', null); $(this).parent('.mt10').after(html); + var inputs = document.getElementsByName("program[input][]"); + var outputs = document.getElementsByName("program[output][]"); + if (inputs.length == outputs.length) { + for (var i=0; i Date: Tue, 29 Sep 2015 10:13:25 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=92=8C=E7=BC=96=E8=BE=91=E7=94=A8=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 22 +++++++++++----------- app/views/memos/edit.html.erb | 19 +++++++++---------- app/views/memos/show.html.erb | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 48ac057a0..714d364a4 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag 'new_user' %> +<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %> @@ -99,11 +103,7 @@
    - - + <%= kindeditor_tag 'memo[content]','',:height=>300,:editor_id=>'memo_content'%>
    diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 310cdb6ad..1ac86cf55 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -1,21 +1,24 @@ -<%= javascript_include_tag 'new_user'%> +<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor'%> @@ -35,11 +38,7 @@
    - - + <%= kindeditor_tag 'memo[content]',@memo.content,:height=>300,:editor_id=>'memo_content'%>
    diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 550c7a4fe..ceb2b8cb1 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -65,7 +65,7 @@ <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
    -
    +
    <%= @memo.content.html_safe%>
    From 5002daad5223bea13b3abe2562dfbdc32062f7a7 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 10:34:05 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4027121b4..4a876cec7 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -762,7 +762,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;} .postDetailWrap {width:580px; float:left;} .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} -.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;white-space:nowrap;text-overflow:ellipsis;} +.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} .postDetailReply { margin-top:28px; color:#888888; float:right;}