From 2873412d1a120d02530e51bb4d7471b00ea68df5 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 28 Sep 2015 15:06:23 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6--?= =?UTF-8?q?=E6=AF=8F=E5=A4=A9=E5=8F=91=E9=80=81-=E3=80=8B=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=BA=E7=A9=BA=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/models/mailer.rb | 1 + app/views/mailer/send_for_user_activities.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index b820e6d54..3168a4d4d 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -247,6 +247,7 @@ class Mailer < ActionMailer::Base has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,@project_attachments, @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?} + mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}" #有内容才发，没有不发 mail :to => user.mail,:subject => subject if has_content diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 6fc742c99..3f761fbd4 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -7,7 +7,7 @@

<%= l(:label_course_overview)%>

- <% unless @course_news.first.nil? || @course_news_comments.first.nil? %> + <% if !@course_news.first.nil? || !@course_news_comments.first.nil? %>
- - + <%= 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 769a4a1bcfee4ed8323e1855ca611198e90d744d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Sep 2015 10:15:35 +0800 Subject: [PATCH 14/31] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0issue=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=A5=E6=9C=9F=E6=8F=90=E9=86=92=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=9B=202.=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=BA=94rake=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_forge.html.erb | 70 ++++++++++++++------ lib/tasks/issue_due_date.rake | 2 - 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index fcd4ba30a..641fb9269 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -56,28 +56,54 @@ <% end %> <% if ma.forge_message_type == "Issue" %> - + <% if ma.status == 1%> + + <% else %> + + <% end %> <% end %> <% if ma.forge_message_type == "Journal" %>
    diff --git a/lib/tasks/issue_due_date.rake b/lib/tasks/issue_due_date.rake index bf5566789..f40fa290f 100644 --- a/lib/tasks/issue_due_date.rake +++ b/lib/tasks/issue_due_date.rake @@ -4,14 +4,12 @@ namespace :issue_due_date do task :end_time => :environment do contrast_time = Time.now - 86400 issues = Issue.where("due_date >=? and due_date <=?",contrast_time,Time.now) - puts issues issues.each do |issue| if ForgeMessage.where("forge_message_type =? and forge_message_id =? and status =?", "Issue", issue.id, 1).first.nil? recipients = [] assigner = User.find(issue.assigned_to_id) recipients << issue.author recipients << assigner - puts recipients recipients.each do |r| issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1) # 发送邮件通知 From ad4fc50fbb8c9203859753c637c19f1964c0b542 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 29 Sep 2015 10:20:13 +0800 Subject: [PATCH 15/31] =?UTF-8?q?1=E3=80=81=E5=BC=95=E5=85=A5=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=88=B0=E4=BD=9C=E4=B8=9A=E7=A7=BB=E9=99=A4=E9=83=A8?= =?UTF-8?q?=E5=88=86css=202=E3=80=81=E8=AF=BE=E7=A8=8B=E5=86=85=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 5 ++--- app/controllers/users_controller.rb | 1 + app/views/homework_common/index.html.erb | 2 +- app/views/homework_common/index.js.erb | 1 + app/views/layouts/base_courses.html.erb | 2 +- app/views/users/_user_homework_list.html.erb | 8 +++++++- app/views/users/import_resources_to_homework.js.erb | 2 +- app/views/users/user_homeworks.js.erb | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 app/views/homework_common/index.js.erb diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 9deb2eb5f..6c8ccd4a9 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -18,8 +18,7 @@ class HomeworkCommonController < ApplicationController @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10) @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher)) - # @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset() - # @homeworks = paginateHelper homeworks,20 + @is_new = params[:is_new] respond_to do |format| format.js format.html @@ -38,7 +37,7 @@ class HomeworkCommonController < ApplicationController def edit @user = User.current - @is_in_course = params[:is_in_course] + @is_in_course = params[:is_in_course].to_i respond_to do |format| format.html{render :layout => 'new_base_user'} end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6caa137ee..4f3df3bd4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -346,6 +346,7 @@ class UsersController < ApplicationController user_course_ids = @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")" @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10) @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true) + @is_in_course = params[:is_in_course].to_i || 0 respond_to do |format| format.js format.html {render :layout => 'new_base_user'} diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 4a4c95757..2f6d0bfd9 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -36,7 +36,7 @@
<% end%> - <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1} %> + <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
diff --git a/app/views/homework_common/index.js.erb b/app/views/homework_common/index.js.erb new file mode 100644 index 000000000..7a038eb5c --- /dev/null +++ b/app/views/homework_common/index.js.erb @@ -0,0 +1 @@ +$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>"); \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index c226599e2..57dab9933 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -91,7 +91,7 @@ <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
- <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id,:is_new => 1), :class => "f14 c_blue02"%> <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> <%= link_to( "+#{l(:label_course_homework_new)}", "javascript:void(0)", :class => 'subnav_green c_white', :onclick => "new_homework_alert();") if is_teacher %>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index dbbc619a3..336a62d37 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -80,5 +80,11 @@ <% end%> <% if homework_commons.count == 10%> - <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> + <% if is_in_course == 1%> + + <%= link_to "加载更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> + <% else%> + + <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> + <% end%> <% end%> \ No newline at end of file diff --git a/app/views/users/import_resources_to_homework.js.erb b/app/views/users/import_resources_to_homework.js.erb index b77590095..61fcd294d 100644 --- a/app/views/users/import_resources_to_homework.js.erb +++ b/app/views/users/import_resources_to_homework.js.erb @@ -12,5 +12,5 @@ '
') <% end %> - hideModal(); + hideResource(); <% end %> \ No newline at end of file diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb index b6703dd43..cc1bc051a 100644 --- a/app/views/users/user_homeworks.js.erb +++ b/app/views/users/user_homeworks.js.erb @@ -1,2 +1,2 @@ -$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page} )%>"); +$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page,:is_in_course => 0} )%>"); From 2557e9063de3ab9f993e58d58ea97392115c9d13 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Sep 2015 10:25:37 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E4=B8=AD=E7=9A=84send=5Fmessage=5Fanonymous?= =?UTF-8?q?=5Fcomment=E6=96=B9=E6=B3=95=E6=88=90=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/homework_evaluation.rake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index c8f9408a0..b061af328 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -26,7 +26,11 @@ namespace :homework_evaluation do end homework_detail_manual.update_column('comment_status', 2) # 匿评开启消息邮件通知，# 所有人 - send_message_anonymous_comment(homework_common, 2) + #send_message_anonymous_comment(homework_common, 2) + course = homework_common.course + course.members.each do |m| + homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2) + end # 邮件通知 Mailer.send_mail_anonymous_comment_close(homework_common).deliver else From dea03a4d9f20bcc0809b01f88531c5377e9b33fa Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 29 Sep 2015 10:26:22 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=92=8C=E5=9B=9E=E5=A4=8D=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=A4=A7=E5=B0=8F=E7=9A=84=E8=B0=83=E6=95=B4=E5=92=8C?= =?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/_course_journalsformessage.html.erb | 6 ++++-- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 3 ++- app/views/users/_project_issue.html.erb | 16 +-------------- app/views/users/_project_message.html.erb | 3 ++- app/views/users/_user_activities.html.erb | 20 +++++++++++++++++++ 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index a2c4e4504..1fcd3797e 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -62,7 +62,8 @@ <% end %> <%= format_time(comment.created_on) %> -
<%= comment.notes.html_safe %>
+
+ <%= comment.notes.html_safe %>
<% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
@@ -83,7 +84,8 @@ <% end %> <%= format_time reply.created_on %>
-
<%= reply.notes.html_safe %>
+
+ <%= reply.notes.html_safe %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 65bf644bc..8ec605567 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -87,7 +87,7 @@ <% end %> <%= format_time(reply.created_on) %> -
+
<%= reply.content.html_safe %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index f5d570fe0..4b5b73ceb 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -60,7 +60,8 @@ <% end %> <%= format_time(comment.created_on) %> -
<%= comment.comments.html_safe %>
+
+ <%= comment.comments.html_safe %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index bb3c4cb54..2c429a93f 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -97,7 +97,7 @@ <% end %> <%= format_time(reply.created_on) %> -
+
<% if reply.details.any? %> <% details_to_strings(reply.details).each do |string| %>

<%= string %>

@@ -133,17 +133,3 @@
- \ No newline at end of file diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 9be1145ff..ead43d7e4 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -74,7 +74,8 @@ <% end %> <%= format_time(reply.created_on) %> -
<%= reply.content.html_safe %>
+
+ <%= reply.content.html_safe %>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index ea9c572d9..29752121f 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -37,6 +37,26 @@ $(function() { init_activity_KindEditor_data(<%= user_activity.id%>,null,"87%"); + var description_images=$("div#activity_description_<%= user_activity.id %>").find("img"); + if (description_images.length>0) { + for (var i=0; i").attr("href",image.attr('src')); + image.wrap(element); + } + } + $('#activity_description_<%= user_activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); + + var reply_images=$("div#reply_content_<%= user_activity.id %>").find("img"); + if (reply_images.length>0) { + for (var i=0; i").attr("href",image.attr('src')); + image.wrap(element); + } + } + $('#reply_content_<%= user_activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); + }); <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %> 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 18/31] =?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;} From 8585748a920b13faa5dcd104933264c11bd2e396 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 29 Sep 2015 10:38:14 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=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/homework_common/index.html.erb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 2f6d0bfd9..c725384fd 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -16,6 +16,13 @@
From 61061573a73dd9075d7f9a9de705742e474f4998 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 29 Sep 2015 10:42:17 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93git=E6=93=8D=E4=BD=9C=E6=8C=87=E5=8D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 144 +++++++++++++-------------- public/javascripts/project.js | 46 ++++----- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 5f279f2c2..cbb899db3 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -29,78 +29,78 @@

-
展开Git操作指南
-
-
-
-

git 克隆和提交的用户名和密码为登录用户名和密码

-

项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码。

-

通过cmd命令提示符进入代码对应文件夹的根目录， - 如果是首次提交代码，执行如下命令：

-
-
-

git init

- -

git add *

- -

git commit -m "first commit"

- -

git remote add origin - <%= @repos_url %> -

- -

git config http.postBuffer 524288000 #设置本地post缓存为500MB

- -

git push -u origin master

-
- -
-

已经有本地库，还没有配置远程地址，打开命令行执行如下：

-
-
-

git remote add origin <%= @repos_url %>

- -

git add .

- -

git commit -m "first commit"

- -

git config http.postBuffer 524288000 #设置本地post缓存为500MB

- -

git push -u origin master

-
- -
-

已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：

-
-
-

git clone <%= @repos_url %>

- -

git push

- -

git checkout -b branch_name

- -

git push origin branch_name

-
- -
-

从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：

-
-
-

git remote add trustie - <%= @repos_url %> -

- -

git add .

- -

git commit -m "first commit"

- -

git config http.postBuffer 524288000 #设置本地post缓存为500MB

- -

git push -u trustie branch:branch

- -

李海提供

-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if !@entries.nil? && authorize_for('repositories', 'browse') %> <%= render :partial => 'dir_list' %> diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 3553b4cef..c74ff18bf 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -96,29 +96,29 @@ function show_more_reply1(contentid, id2, id3) { } } //项目版本库git帮助文档显示 -function showhelpAndScrollTo(id) { - $('#' + id).toggle(); - if(cookieget("repositories_visiable") == "true") - { - cookiesave("repositories_visiable", false,'','',''); - } - else - { - cookiesave("repositories_visiable", true,'','',''); - } - var information = $("#showgithelp"); - var val = information.attr("value"); - if(val=="show_help") - { - $("#showgithelp").text("收起Git操作指南"); - information.attr("value", "hide_help"); - } - else - { - $("#showgithelp").text("展开Git操作指南"); - information.attr("value", "show_help"); - } -} +//function showhelpAndScrollTo(id) { +// $('#' + id).toggle(); +// if(cookieget("repositories_visiable") == "true") +// { +// cookiesave("repositories_visiable", false,'','',''); +// } +// else +// { +// cookiesave("repositories_visiable", true,'','',''); +// } +// var information = $("#showgithelp"); +// var val = information.attr("value"); +// if(val=="show_help") +// { +// $("#showgithelp").text("收起Git操作指南"); +// information.attr("value", "hide_help"); +// } +// else +// { +// $("#showgithelp").text("展开Git操作指南"); +// information.attr("value", "show_help"); +// } +//} function showhelpAndScrollToMessage(id, id1, count) { $('#' + id).toggle(); if(cookieget("repositories_visiable") == "true") From f2d3ec980a64c0bbf2f7ac956918c397531ae63e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 29 Sep 2015 10:48:50 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/index.html.erb | 8 +++++++- app/views/layouts/base_courses.html.erb | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index c725384fd..0c3dd6d8e 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -12,6 +12,12 @@ $("#RSide").removeAttr("id"); $("#Container").css("width","1000px"); }); + + <% if @is_new%> + $(function(){ + $("#homework_name").focus(); + }); + <%end%>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 57dab9933..4dd5b0b27 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -91,9 +91,9 @@ <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
- <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id,:is_new => 1), :class => "f14 c_blue02"%> + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> - <%= link_to( "+#{l(:label_course_homework_new)}", "javascript:void(0)", :class => 'subnav_green c_white', :onclick => "new_homework_alert();") if is_teacher %> + <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %>
<%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> From 3d9dcfe25045f3b1666b867fadb8d06aaf9ae10d Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 29 Sep 2015 10:49:08 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E4=B8=BA=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E7=9A=84=E6=9C=80=E6=96=B0=E6=8F=90=E4=BA=A4=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 2d7bf02b1..d39d8fe3b 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -173,6 +173,12 @@ class StudentWorkController < ApplicationController end if student_work.save + course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first + course_activity.updated_at = Time.now + course_activity.save + user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first + user_activity.updated_at = Time.now + user_activity.save respond_to do |format| format.html { flash[:notice] = l(:notice_successful_create) From 4624e26999f0a41cd79b926d943b824966398238 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Sep 2015 10:50:16 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=A4=B1=E8=B4=A5=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E6=9C=AC?= =?UTF-8?q?=E4=BA=BA=E8=BF=98=E6=98=AF=E5=85=B6=E4=BB=96=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 16b95b45f..7d6044e64 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -191,7 +191,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% if !@entries.nil? && authorize_for('repositories', 'browse') %> <%= render :partial => 'dir_list' %> <% end %> From 7f8acf55b8b1adfc3542749f266108a6b2942ebc Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 29 Sep 2015 11:05:31 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E9=85=8D=E7=BD=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 8798002c9..868f952fa 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -46,28 +46,28 @@
<%= activity.description.html_safe %>
- <% if is_teacher%> -
+ <%# if is_teacher%> +
From 7057247700de0aad8d8370440a6ef7c84186fc34 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 29 Sep 2015 11:54:43 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/comments_controller.rb | 12 ++++++++---- app/controllers/messages_controller.rb | 12 ++++++++---- app/controllers/student_work_controller.rb | 12 ++++++++---- app/controllers/words_controller.rb | 16 ++++++++++------ 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 1efbc9c48..8a64918ae 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -50,11 +50,15 @@ class CommentsController < ApplicationController # # ������ض�̬�ļ�¼add end flash[:notice] = l(:label_comment_added) course_activity = CourseActivity.where("course_act_type='News' and course_act_id =#{@news.id}").first - course_activity.updated_at = Time.now - course_activity.save + if course_activity + course_activity.updated_at = Time.now + course_activity.save + end user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first - user_activity.updated_at = Time.now - user_activity.save + if user_activity + user_activity.updated_at = Time.now + user_activity.save + end end if params[:user_activity_id] diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index c6ac8b906..4f3f3ec0d 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -163,11 +163,15 @@ class MessagesController < ApplicationController # @reply.reply_id = params[:id] @topic.children << @reply course_activity = CourseActivity.where("course_act_type='Message' and course_act_id =#{@topic.id}").first - course_activity.updated_at = Time.now - course_activity.save + if course_activity + course_activity.updated_at = Time.now + course_activity.save + end user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first - user_activity.updated_at = Time.now - user_activity.save + if user_activity + user_activity.updated_at = Time.now + user_activity.save + end #@topic.update_attribute(:updated_on, Time.now) if !@reply.new_record? if params[:asset_id] diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index d39d8fe3b..f2858d097 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -174,11 +174,15 @@ class StudentWorkController < ApplicationController if student_work.save course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first - course_activity.updated_at = Time.now - course_activity.save + if course_activity + course_activity.updated_at = Time.now + course_activity.save + end user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first - user_activity.updated_at = Time.now - user_activity.save + if user_activity + user_activity.updated_at = Time.now + user_activity.save + end respond_to do |format| format.html { flash[:notice] = l(:notice_successful_create) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index a0ce8d18e..a59f507df 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -55,12 +55,16 @@ class WordsController < ApplicationController @jfm = add_reply_adapter options @save_succ = true if @jfm.errors.empty? if @save_succ - course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first - course_activity.updated_at = Time.now - course_activity.save - user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first - user_activity.updated_at = Time.now - user_activity.save + course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first + if course_activity + course_activity.updated_at = Time.now + course_activity.save + end + user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first + if user_activity + user_activity.updated_at = Time.now + user_activity.save + end end respond_to do |format| # format.html { From a8bb7ca2bc253ee5d35636d9a1d4c27c19b831bd Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 12:05:30 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 52309912e..87c5b12e5 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -143,6 +143,9 @@
+
+ » 贴吧 » <%= @forum.name%> <%if @memo %> » <%= @memo.subject%><% end %> +
<%= link_to image_tag(url_to_avatar(@forum.creator),:width=>75,:height => 75,:alt=>'贴吧图像' ),user_path( @forum.creator) %> From 4f63f3fd2ae8ee3a3cf11b16aff8a0640712fbef Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 12:06:56 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 3af6597eb..747931f2f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -318,12 +318,16 @@ a:hover.search_btn{ background: #0fa9bb;} /*资源库*/ .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} +/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/ .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;} .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;} .resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;} .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;} .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;} .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;} +/*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/ +/*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/ +/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/ a.resourcesGrey {font-size:12px; color:#888888;} a.resourcesGrey:hover {font-size:12px; color:#269ac9;} .resourcesBanner ul li:hover ul.resourcesType {display:block;} @@ -335,13 +339,21 @@ a.uploadText {color:#ffffff; font-size:14px;} .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;} .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;} .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;} +/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/ .resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;} +/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/ .resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;} +/*.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}*/ +/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/ +/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/ +/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/ +/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/ .resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;} .resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;} .resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;} .resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;} .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;} +/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left} a.resourcesBlack:hover {font-size:12px; color:#000000;} .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;} @@ -350,6 +362,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;} .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;} .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;} .resourcesSelectSend {float:right;} +/*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/ .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;} a.sendButtonBlue {color:#269ac9;} a.sendButtonBlue:hover {color:#ffffff;} @@ -447,7 +460,7 @@ input.sendSourceText:hover {background-color:#297fb8;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden;} -.popbox{position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px; -moz-border-radius:5px;} +.popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px; /* background:#fff; */ -moz-border-radius:5px; /* -webkit-border-radius:5px; */ /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */ /* overflow:auto; */} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} .uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block;} @@ -689,7 +702,7 @@ ul.list_watch{ .w450{width: 450px;} /*引用资源库弹窗*/ -.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:16px !important; padding-right:16px !important; padding-bottom:16px !important; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;} +.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;} .referenceText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight:bold;} .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;} .searchReferencePopup {border:none; outline:none; background-color:#ffffff; width:190px; height:32px; padding-left:10px; display:inline-block; float:left;} @@ -768,6 +781,9 @@ a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repe .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;} .pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;} .homepagePostReplyInput {width:543px; height:33px; max-width:543px; max-height:33px; border:1px solid #d9d9d9; outline:none;} +.postRouteContainer {padding:10px 15px; background-color:#ffffff; border:1px solid #dddddd; margin-top:10px; font-size:14px;} +a.postRouteLink {font-weight:bold; color:#484848;} +a.postRouteLink:hover {text-decoration:underline;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} From de62798d4dc0139e5975831f27728dced7a22fe6 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 13:54:54 +0800 Subject: [PATCH 29/31] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_praise_tread.html.erb | 2 +- app/views/memos/show.html.erb | 12 +++++++----- public/stylesheets/new_user.css | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb index 17af4b090..13287836e 100644 --- a/app/views/memos/_praise_tread.html.erb +++ b/app/views/memos/_praise_tread.html.erb @@ -2,7 +2,7 @@ <% if User.current.logged? %> <% if horizontal %> -
+
<% @is_valuate = is_praise_or_tread(obj,user_id)%> <% if @is_valuate.size > 0 %> <% @flag = @is_valuate.first.praise_or_tread %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index ceb2b8cb1..429ada557 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -58,13 +58,15 @@
<%end%> -
主题: <%= @memo.subject%>
+
+ 主题: <%= @memo.subject%> + <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> +
+
+
<%= @memo.author.name%>
<%= format_date( @memo.created_at)%>
- - <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> - -
+
<%= @memo.content.html_safe%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 747931f2f..79ed27afa 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -761,7 +761,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re .postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;} .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;} .postDetailWrap {width:580px; float:left;} -.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} +.postDetailTitle {width:650px; max-width:650px; margin-bottom:5px;} .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;} @@ -773,7 +773,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no .postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;} .postThemeContainer {width:720px;} .postThemeWrap {width:655px; float:left;position: relative} -.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px;} +.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-right:30px; margin-top:3px;} .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;} a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;} From 6d7486715048c8bb2f2e5b5127698f39d21f5d4e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 13:58:39 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=B5=AE=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 429ada557..b42bc9523 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -66,7 +66,7 @@
<%= @memo.author.name%>
<%= format_date( @memo.created_at)%>
- +
<%= @memo.content.html_safe%>
From c75487fcf5f9db5d323b42372e3cdb0e5685551e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 14:27:53 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E8=AE=BA=E5=9D=9B?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=A4=AA=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 87c5b12e5..9faecd964 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -144,7 +144,7 @@
- » 贴吧 » <%= @forum.name%> <%if @memo %> » <%= @memo.subject%><% end %> + » 贴吧 » <%= truncate(@forum.name,:lenght=>32)%> <%if @memo %> » <%= @memo.subject%><% end %>