From 7b9d88ecfeefd465be895efb398d961e6782be8b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 20 Jan 2015 11:42:28 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=96=B0=E5=8F=91=E5=B8=83=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 20 +++++++++++-- app/views/poll/_poll.html.erb | 43 ++++++++++++++++++++++++++++ app/views/poll/index.html.erb | 39 +------------------------ app/views/poll/republish_poll.js.erb | 1 + config/routes.rb | 1 + 5 files changed, 63 insertions(+), 41 deletions(-) create mode 100644 app/views/poll/_poll.html.erb create mode 100644 app/views/poll/republish_poll.js.erb diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 739adfe1c..6890b8dd7 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -1,8 +1,8 @@ class PollController < ApplicationController - before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll] + before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll] before_filter :find_container, :only => [:new,:create, :index] before_filter :is_member_of_course, :only => [:index,:show] - before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll] + before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll] include PollHelper def index if @course @@ -311,6 +311,19 @@ class PollController < ApplicationController end end + #重新发布问卷 + def republish_poll + @poll.poll_questions.each do |poll_question| + poll_question.poll_votes.destroy_all + end + @poll.poll_users.destroy_all + @poll.polls_status = 1 + @poll.save + respond_to do |format| + format.js + end + end + private def find_poll_and_course @poll = Poll.find params[:id] @@ -337,7 +350,8 @@ class PollController < ApplicationController end def is_course_teacher - render_403 unless(@course && User.current.allowed_to?(:as_teacher,@course)) + @is_teacher = User.current.allowed_to?(:as_teacher,@course) + render_403 unless(@course && @is_teacher) end #获取未完成的题目 diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb new file mode 100644 index 000000000..8ae766516 --- /dev/null +++ b/app/views/poll/_poll.html.erb @@ -0,0 +1,43 @@ +
  • + <% if @is_teacher %> + <% if has_commit_poll?(poll.id ,User.current) %> + <%= poll.polls_name %> + <% else %> + <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %> + <% end %> + <% else %> + <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %> + + <%= poll.polls_name %> + + <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %> + <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %> + <% end %> + <% end %> +
    • +
  • + <%if @is_teacher && poll.polls_status == 2%> + <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%> + <% end%> +
    • +
  • + <% if @is_teacher %> + + <%= link_to(l(:button_delete), poll, + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10") %> + <% end%> +
    • +
  • + <% if @is_teacher && poll.polls_status == 1%> + + <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%> + <% end%> +
    • +
  • + <% if @is_teacher && poll.polls_status == 2%> + <%= link_to "重新发布", republish_poll_poll_path(poll.id), :remote => true, :class => 'polls_de fr ml20' %> + <% end %> +
    • +
  • + <%= format_time poll.created_at%> +
    • \ No newline at end of file diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index e57674c7a..fa378fc7b 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -12,44 +12,7 @@
    <% @polls.each do |poll|%>
    <% end%> diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb new file mode 100644 index 000000000..a7399af5b --- /dev/null +++ b/app/views/poll/republish_poll.js.erb @@ -0,0 +1 @@ +$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>"); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index bd1b27dee..67b0118b0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -65,6 +65,7 @@ RedmineApp::Application.routes.draw do post 'create_poll_question' post 'commit_poll' get 'publish_poll' + get 'republish_poll' end collection do delete 'delete_poll_question' From 77cb2b08934bc5569c0e702db6ab06978665808f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 20 Jan 2015 16:50:16 +0800 Subject: [PATCH 02/31] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E9=97=AE=E5=8D=B7=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E8=BF=87=E9=95=BF=E6=97=B6=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=202.=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll.html.erb | 4 ++- app/views/poll/_poll_republish.html.erb | 44 +++++++++++++++++++++++++ app/views/poll/index.html.erb | 27 +++++++++++++++ public/stylesheets/polls.css | 2 +- 4 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 app/views/poll/_poll_republish.html.erb diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb index 8ae766516..dea4e175b 100644 --- a/app/views/poll/_poll.html.erb +++ b/app/views/poll/_poll.html.erb @@ -35,7 +35,9 @@
  • <% if @is_teacher && poll.polls_status == 2%> - <%= link_to "重新发布", republish_poll_poll_path(poll.id), :remote => true, :class => 'polls_de fr ml20' %> + + 取消发布 + <% end %>
  • diff --git a/app/views/poll/_poll_republish.html.erb b/app/views/poll/_poll_republish.html.erb new file mode 100644 index 000000000..3688ba883 --- /dev/null +++ b/app/views/poll/_poll_republish.html.erb @@ -0,0 +1,44 @@ + + + + + + + +
    +
    +
    +

    + 问卷取消发布后学生提交的问卷答案将会被清空， +
    + 是否确定取消发布该问卷？ +

    +
    + <%= link_to "确 定",republish_poll_poll_path(poll.id), :class => "upload_btn", :onclick => "clickCanel();" %> + + 取  消 + +
    +
    +
    + +
    + +
    + + + diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index fa378fc7b..043e6898b 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -1,4 +1,31 @@ <%= stylesheet_link_tag 'polls', :media => 'all' %> +

    所有问卷 diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 58ae913b0..4141164c4 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -27,7 +27,7 @@ a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd a:hover.newbtn{ background:#55a1b9; text-decoration:none;} .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;} a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} -.polls_title{ font-weight:bold; color:#3e6d8e;} +.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;} a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;} .polls_date{ color:#666666;} From f3062da237ba7a010bc708a1a119a3ab4149b93c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 09:18:29 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD(=E5=B1=85=E7=84=B6?= =?UTF-8?q?=E6=98=AF=E6=AD=BB=E5=BE=AA=E7=8E=AF=E3=80=82=E3=80=82=E3=80=82?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 927734b24..d427a9aea 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -122,6 +122,7 @@ else course_term = "春季学期" end%> + <%break if Time.new.strftime("%Y").to_i - year_now >= 2%> <% all_new_hot_course += find_all_new_hot_course(course_count-all_new_hot_course.count, @school_id, year_now, course_term)%> <% end%> <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %> @@ -152,6 +153,7 @@ else course_term = "春季学期" end%> + <%break if Time.new.strftime("%Y").to_i - year_now >= 2%> <% all_new_hot_course += find_all_new_hot_course(9-(all_new_hot_course.count + cur_school_course.count), @school_id, year_now, course_term)%> <% end%> <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %> From 402dfc788fbd5840a34984eb7f942f013de2d08d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 09:55:40 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=97=B6=E9=97=AE=E5=8D=B7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 2 +- app/views/poll/_show_head.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 6890b8dd7..2fc586711 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -40,7 +40,7 @@ class PollController < ApplicationController def new if @course option = { - :polls_name => l(:label_poll_new), + :polls_name => "", :polls_type => @course.class.to_s, :polls_group_id => @course.id, :polls_status => 1, diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb index ce74dc10a..7ab16b24d 100644 --- a/app/views/poll/_show_head.html.erb +++ b/app/views/poll/_show_head.html.erb @@ -1,7 +1,7 @@

    - <%= poll.polls_name%> + <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>

    <%= @poll.polls_description%> From 3bdaeb20c217bac98a682aa3b88ecb1dbd7536c3 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 11:14:01 +0800 Subject: [PATCH 05/31] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=202=E3=80=81=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=91=E5=B8=83=E9=97=AE=E5=8D=B7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=203=E3=80=81=E5=A2=9E=E5=8A=A0js=E8=BF=94=E5=9B=9E=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=204=E3=80=81=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84js=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 8 +++- app/views/poll/_poll.html.erb | 64 +++++++++++++++++-------- app/views/poll/_poll_form.html.erb | 2 +- app/views/poll/_poll_republish.html.erb | 12 ----- app/views/poll/_poll_submit.html.erb | 16 +------ app/views/poll/index.html.erb | 24 ++++++++++ app/views/poll/publish_poll.js.erb | 2 + app/views/poll/republish_poll.js.erb | 3 +- public/stylesheets/polls.css | 15 +++++- 9 files changed, 94 insertions(+), 52 deletions(-) create mode 100644 app/views/poll/publish_poll.js.erb diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 2fc586711..42ab98e10 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -187,7 +187,13 @@ class PollController < ApplicationController @poll.polls_status = 2 @poll.published_at = Time.now if @poll.save - redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id) + if params[:is_remote] + redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id) + else + respond_to do |format| + format.js + end + end end end diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb index dea4e175b..cc7e88547 100644 --- a/app/views/poll/_poll.html.erb +++ b/app/views/poll/_poll.html.erb @@ -1,23 +1,44 @@ +<% has_commit = has_commit_poll?(poll.id ,User.current)%>

  • <% if @is_teacher %> - <% if has_commit_poll?(poll.id ,User.current) %> - <%= poll.polls_name %> + <% if has_commit %> + + <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%> + <% else %> - <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %> + <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %> <% end %> <% else %> - <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %> + <% if has_commit && poll.polls_status == 2 %> - <%= poll.polls_name %> + <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %> - <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %> - <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %> + <% elsif !has_commit && poll.polls_status == 2 %> + <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %> <% end %> <% end %>
    • +<% if !@is_teacher && has_commit && poll.polls_status == 2%> +
  • 已答
    • +<% end %> + +<%if @is_teacher%> + <% if poll.polls_status == 1 %> +
  • 统计结果
    • + <% elsif poll.polls_status == 2%> +
  • + <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%> +
    • + <% end%> +<% end%> +
  • - <%if @is_teacher && poll.polls_status == 2%> - <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%> + <%if @is_teacher %> + <% if poll.polls_status == 1 %> + 发布问卷 + <% elsif poll.polls_status == 2%> + 取消发布 + <% end%> <% end%>
  • @@ -28,18 +49,21 @@ <% end%>
  • - <% if @is_teacher && poll.polls_status == 1%> - - <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%> + <% if @is_teacher%> + <% if poll.polls_status == 1 %> + <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%> + <% elsif poll.polls_status == 2%> +
  • 编辑
    • + <% end%> <% end%>

    • -
  • - <% if @is_teacher && poll.polls_status == 2%> - - 取消发布 - - <% end %> -
    • -
  • + + + + + + + +
  • <%= format_time poll.created_at%>
    • \ No newline at end of file diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index bbf71e0ce..6ce4137a3 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -57,7 +57,7 @@ function poll_submit() { - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll},:is_remote => false) %>'); showModal('ajax-modal', '310px'); $('#ajax-modal').css('height','110px'); $('#ajax-modal').siblings().remove(); diff --git a/app/views/poll/_poll_republish.html.erb b/app/views/poll/_poll_republish.html.erb index 3688ba883..3f93b6b3d 100644 --- a/app/views/poll/_poll_republish.html.erb +++ b/app/views/poll/_poll_republish.html.erb @@ -2,18 +2,6 @@ diff --git a/app/views/poll/_poll_submit.html.erb b/app/views/poll/_poll_submit.html.erb index cdc41dd9d..af3ca2d42 100644 --- a/app/views/poll/_poll_submit.html.erb +++ b/app/views/poll/_poll_submit.html.erb @@ -2,18 +2,6 @@ @@ -27,16 +15,14 @@ 是否确定发布该问卷？

    - <%= link_to "确 定",publish_poll_poll_path(poll.id), :class => "upload_btn", :onclick => "clickCanel();" %> + <%= link_to "确 定",publish_poll_poll_path(poll.id,:is_remote => is_remote), :class => "upload_btn", :onclick => "clickCanel();" %> 取  消
    - - diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index 043e6898b..de30b5deb 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -25,6 +25,30 @@ } function clickCanel(){hideModal("#popbox02");} + + function poll_submit(poll_id) + { + $('#ajax-modal').html("
    " + + "
    " + + "
    " + + "

    问卷发布后将不能对问卷进行修改，
    是否确定发布该问卷？

    " + + "
    " + + "确  定" + + "取  消" + + "
    " + + "
    " + + "
    " + + "
    " + + "
    "); + showModal('ajax-modal', '310px'); + $('#ajax-modal').css('height','110px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before("" + + ""); + $('#ajax-modal').parent().removeClass("alert_praise"); + $('#ajax-modal').parent().css("top","").css("left",""); + $('#ajax-modal').parent().addClass("popbox_polls"); + }
    diff --git a/app/views/poll/publish_poll.js.erb b/app/views/poll/publish_poll.js.erb new file mode 100644 index 000000000..ad052f8f2 --- /dev/null +++ b/app/views/poll/publish_poll.js.erb @@ -0,0 +1,2 @@ +$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>"); +alert("发布成功"); \ No newline at end of file diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb index a7399af5b..a2d8e28fa 100644 --- a/app/views/poll/republish_poll.js.erb +++ b/app/views/poll/republish_poll.js.erb @@ -1 +1,2 @@ -$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>"); \ No newline at end of file +$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>"); +alert("取消成功"); \ No newline at end of file diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 4141164c4..e46aa5124 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -26,8 +26,8 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;} a:hover.newbtn{ background:#55a1b9; text-decoration:none;} .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;} -a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} -.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} +a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} +.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;} a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;} .polls_date{ color:#666666;} @@ -134,3 +134,14 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .upload_con a:hover{ text-decoration:none;} .polls_btn_box{ width:145px; margin:0 auto; padding-left:10px;} .polls_btn_box02{ width:80px; margin:0 auto; padding-left:10px;} + +/***新增20150120***/ +.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -417px no-repeat;padding-left:7px; color:#fff;} +a.btn_de{ border:1px solid #ff5d31; color:#ff5d31; } +a:hover.btn_de{ background:#ff5d31;} +a.btn_pu{ border:1px solid #3cb761; color:#3cb761; } +a:hover.btn_pu{ background:#3cb761;} +.pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; } +.polls_title_w { width:330px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} +.polls_de_grey{ color:#b1b1b1;} +.ml5{ margin-left:5px;} From 95dcdd71251982a69348d19f79b4c2ec1d3da8d1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 11:18:47 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index 6ce4137a3..b3fae8b4a 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -57,7 +57,7 @@ function poll_submit() { - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll},:is_remote => false) %>'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>'); showModal('ajax-modal', '310px'); $('#ajax-modal').css('height','110px'); $('#ajax-modal').siblings().remove(); From 6ccb154cc3f6e98e219645474e76370fa6c0e105 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Wed, 21 Jan 2015 11:33:29 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E9=82=AE=E4=BB=B6=E7=BB=99=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BA=BA=20Signed-off-by:=20alan=20<54753343?= =?UTF-8?q?4@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .rspec | 2 + app/helpers/courses_helper.rb | 4 ++ app/models/journals_for_message_observer.rb | 2 + app/models/mailer.rb | 8 ++-- config/application.rb | 10 +++++ .../20150121030451_add_initial_products.rb | 11 ++++++ db/schema.rb | 2 +- spec/spec_helper.rb | 38 +++++++++++++++++++ 8 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 .rspec create mode 100644 db/migrate/20150121030451_add_initial_products.rb create mode 100644 spec/spec_helper.rb diff --git a/.rspec b/.rspec new file mode 100644 index 000000000..8c18f1abd --- /dev/null +++ b/.rspec @@ -0,0 +1,2 @@ +--format documentation +--color diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 411de1dcf..95b049dc2 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -111,6 +111,10 @@ module CoursesHelper #garble count # end + #获取课程所有成员 + def course_member course + course.members + end # 学生人数计算 # add by nwb def studentCount course diff --git a/app/models/journals_for_message_observer.rb b/app/models/journals_for_message_observer.rb index 093002a2c..0e5f29d03 100644 --- a/app/models/journals_for_message_observer.rb +++ b/app/models/journals_for_message_observer.rb @@ -1,7 +1,9 @@ # Added by young class JournalsForMessageObserver < ActiveRecord::Observer def after_create(journals_for_message) + thread1 = Thread.start do Mailer.journals_for_message_add(User.current, journals_for_message).deliver + end end end diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 72e60a0bf..a2e742ee3 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -62,13 +62,13 @@ class Mailer < ActionMailer::Base course = journals_for_message.jour @author = journals_for_message.user #课程的教师 - @teachers = searchTeacherAndAssistant journals_for_message.jour + @members = course_member journals_for_message.jour #收件人邮箱 @recipients ||= [] - @teachers.each do |teacher| - if teacher.user.notify_about? journals_for_message + @members.each do |teacher| + @recipients << teacher.user.mail - end + end mail :to => @recipients, diff --git a/config/application.rb b/config/application.rb index 716e3875d..2f1534d00 100644 --- a/config/application.rb +++ b/config/application.rb @@ -21,6 +21,16 @@ module RedmineApp config.verifier_email = "lizanle521@126.com" end + config.generators do |g| + g.test_framework :rspec, + fixtures: true, + view_specs: false, + helper_specs: false, + routing_specs: false, + controller_specs: true, + request_specs: false + g.fixture_replacement :factory_girl, dir: "spec/factories" + end # Custom directories with classes and modules you want to be autoloadable. config.autoload_paths += %W(#{config.root}/lib) diff --git a/db/migrate/20150121030451_add_initial_products.rb b/db/migrate/20150121030451_add_initial_products.rb new file mode 100644 index 000000000..cb6006068 --- /dev/null +++ b/db/migrate/20150121030451_add_initial_products.rb @@ -0,0 +1,11 @@ +class AddInitialProducts < ActiveRecord::Migration + def up + Forum.create(:name =>"new forum", :description => "", :topic_count => "0", + :memo_count => "0", :last_memo_id =>"0", :creator_id =>"2", + :sticky =>"0", :locked =>"0") + end + + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 2120080a0..7d10abc35 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150114022710) do +ActiveRecord::Schema.define(:version => 20150121030451) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 000000000..d2cbea7d9 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,38 @@ +# This file is copied to spec/ when you run 'rails generate rspec:install' +ENV["RAILS_ENV"] ||= 'test' +require File.expand_path("../../config/environment", __FILE__) +require 'rspec/rails' +require 'rspec/autorun' + +# Requires supporting ruby files with custom matchers and macros, etc, +# in spec/support/ and its subdirectories. +Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } + +RSpec.configure do |config| + # ## Mock Framework + # + # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: + # + # config.mock_with :mocha + # config.mock_with :flexmock + # config.mock_with :rr + + # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures + config.fixture_path = "#{::Rails.root}/spec/fixtures" + + # If you're not using ActiveRecord, or you'd prefer not to run each of your + # examples within a transaction, remove the following line or assign false + # instead of true. + config.use_transactional_fixtures = true + + # If true, the base class of anonymous controllers will be inferred + # automatically. This will be the default behavior in future versions of + # rspec-rails. + config.infer_base_class_for_anonymous_controllers = false + + # Run specs in random order to surface order dependencies. If you find an + # order dependency and want to debug it, you can fix the order by providing + # the seed, which is printed after each run. + # --seed 1234 + config.order = "random" +end From 2f8a183168b265bf9814a41cbc10577eba641bdb Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 11:34:53 +0800 Subject: [PATCH 08/31] =?UTF-8?q?1=E3=80=81=E6=9B=BF=E6=8D=A2=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=9B=BE=E7=89=87=202=E3=80=81=E5=B7=B2=E7=AD=94?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=90=8E=E9=97=AE=E5=8D=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=B2=E7=AD=94=E6=A0=87=E5=BF=97=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/images/icons.png | Bin 2382 -> 2479 bytes public/stylesheets/polls.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/images/icons.png b/public/stylesheets/images/icons.png index 2d2b33fe1a24f741e781b935549f8172180870ad..e0ba4f4e6525285ce88227c93c3fa01348628857 100644 GIT binary patch literal 2479 zcmZ`*2~d;Q7XGskG^`2|g|H}#f}mJHksU=uF@YCamKXwxP}$NTvI`_Yw3J;)Y>-VM zQI;rM2*fBstJFwTtg;6Eu~dWr22t4pzI5Kqo6dXf%y;KIbLM{Mo_p_^Gbh&k!oq`gwU>Df>-w>_=WuqEAlrkDr}HS3oZ^_zxmlVz8eT?q)6i2qS2?1+ere;2 zGk2~XbKkNB&On;)ZPN7m*{K-mew{6rfsU`G^L;aYLpF)6lgAm4lIGBvE{hfMADjnm z63fMA)K#&pYt6mct0>H9IE)(rR3Au2Xw(5ddoeBjvq9YWPQHpqORr{dA6-D zdb@7^3*Y99`dzaR6Xp;75_gU4E=&b>4Y6nsXv3ir|Cn_2{;fI@S;b-5d2KzZ{o^Ly zX!P!(1e=%iymI=PDh-iKE`Y50JAgw!&AcjT&2u)hRtqS6-{FDc;jQ8}L(nWWhf>w| zTVmz8Fs@1e|6k!ho?d^G+>8fFal_LVcn;$Vd-YL?N79bMhk06%kyYaq*A5>j7eIy@ zP!em@5wk5tCZ*aH;e0!s+i;_n8$|mbAZew*k|vhArrL8K<2gDBA|JOekK=;__<;aK z^sm+Jkq3B(V@PeOlaHQ<`q~8DwfD3k>K5dd#vF7Tj@#jxkTrl3~DF_L`P(ALp}ay!f#23Z#7iOQIaF=Rvw* z#PI2E6*=lGaC-w`VTa5L3=yI*V|HN8z)C;}{aOX$wO)rsDA^-A-2v48po|3^F|TL> zFiZCWr)9U{3Jfm|@kpLK1=fX^`rZ3|Vq1hk3z(s&^nLqUU7W=mGsDN;*?;^9$gjc& zU0@PYVUY!^@ZBcT#ck8bZ9$^-1OCVLdH0{BZ6>S|rAwUyE5E0Vf|L0@FiCxx!&V!C zeg}WiLbfdFJsu9Y7|-WX_F>2e!gXpFuT7_D5$ezR#OXxf@X1-+80|>`b%t#NENOwu0gnTy4KS zy2jpS`^s_&%tt3b*0~-Hu1TZ_X97E2m|XlUqlt1GMihGboVxr$xRVkNj^~qe!%2wbon%JAnHP!R;JbwCpkHp#^2(<8bLqFF#AC=M z_qHE1on=a(zHm)g1Upz^ORf)R7@rYC^I~SM0v9$eX|FMdY{@0x1P>OJZ9^pQmHB~m z>WUWIMTHQ-bQfC4vNhd(^nC7=L-zP9QV%FqPdJ*7npIt9D1USRp-7_o6k*vfK6}?} z;-m$Cky%H}qfhZkJD4uu1K}X$_Q^?XIk5I2zr`M>Q0Im-rskfdUz`g*U4v6F%_SQ^*L%pTM%NT6VXWFz1sekaHYVqTwcJch>9ZsoExZ3s z-$HAIHokHgjN(2moX(Eoj&v!yA)a{fog~=U|55PiY-qAG)Il7vKtRA;21&fdBPr23 zDYv9^dMw1zwfG6Il#(glCZ~0mn?V}Fgy5qU9>DFL!p@c@=B7-4vy{sosK0z{S;Bk} zzq^so8zY6}2aeAoGBy%&@fs%^c~wq>341-;ryl3wHAZzM5P?>pozW?BBU@Yu58>~8 zM#Qv*yw(wW70o-)Ba>_MjJpPs;mj sYp6*W92!kPdDk%9tSIS!e1!qVBLZ96PYv^mVGB5R1nY6@P-xb_0kz3y2mk;8 literal 2382 zcmZ`*3pA8l8{VHWqG)o7C9r0BG?5d|Mar z6ae8y08IM>V3h@cTu7Q<(*XcPdvOl-CnAStbN!wudMdrPV|YE4Jn|@OBmujK`<;Mu zxJ@@p<%H{>OElK>Pq;RsM@f0&zU5RV*2|HrZ7AL#3effFNye*YNm~Wfym_72@`neJHLtBX5s`ccOby$7Sx^S+`hO#yY z1E_T?$Ke3Dz)bSkUt| z+;RNG=zjN(rV`4K6(K$_%op0Su`}#_% z^>m}{bXGNlbZ9@talLX+i$4uE4_-C#vHg`}g6GarG@XRWX#qxW+i0iy;_bo;WF_(c zcJN2wHxoKHz#W5lFA5lCCXMQP^4iel{D z3y&vuvAm_x>2+3+%-;V4ct(~yp|IzUd9G*H1?EXyu^JTmN1pM4>R$jfja%IjWx)z) z<{scTGDq#-nL0kQY%)EioPtaBiJ+DDX#Cu#!2CG0vuIz@3Cr-kMZGRXCk)DV7Ev<9 z*jf!KOeSL5vwhTH;kM9N|{tf*r7I#GwD_?$piKMt;10G&6dH+Cx))^JvAe5(Db2}Ku z(2hnD^U%J}U$aou+Aq#9MCUh|fB|#qxvbTcu=zmbdH+hGoQ#S{o^a*h)3CtCZ_3dO zB~Qu4gBATpwH@Z|5w@vTPywuK+HNxquNjDSTw2vtIMJ0AU9k((FD=FUBL6IAGrL_` z#r2SquKIAIX`j0ZqxVrnX}Z;PVJ7Ab`)hp1Cs#VZxJ5bMuL7lvY%c2ko<22~-&2RU@Y;D@d};d7RFZl?i0GIvPl~5c-7lH(3jW^REI8RtSQaruG|0z- z=`Cj;J>#hC{ zLX|UTScy*X8e#nOV89kZLL}`(zoZ!Z-31>V>x3H`h>RtzMFZJBvu?2XpJHr@uwsU~ zsk7cG`6)t=Gi+uZgBCAwuhK*=Gb9(YlkyK^Hsj#J)^mN%usK~E2h09$s4hkJlAN8i zzj=p7OmoSg3A(NnNJBOJwK2*1&{B4iXY2G>yFP?cmoiG#`9b7{!N{kx1|n?Eh@wwh zD^FIi1d^3i|ESX$hAw-CZS8El?pJlXsS!6GuK zKz=4A#>9Y|+U`*j9_9+OK*$-q)MafR-+0u#;{I0Nepn^8!MGIu9wyE{Y|a4nt(DXo zyy3di@@}$tWTC1LAzJ|&fpQ4=!`09-J%$@B_bF;rinu*s-mKZDW#h7I&CM%%yg;N5 zj)6OEB(yO;q-?&hHv<-$S=9o5Xl(0qsq75~U5|~mx(JGhEo?{|pz@Cnt*DW&5m#tO zkk`i7^O$!iRlw)zk$|@MrN@U)DL8UYkG!vsBmZV@5f=spi_6e0nrfY!5UN(xsGFd+ z$zUQ-f$E{?o;?vhN$9A?9blN9%zDJjmW347VWKHi)Ue3NMQ#XWnD`-6v5{7cld0_IKIfVMo`C33gQL6?e5 zorWXGn%4j7*#?%-0_vW=lOngA$S`}A?aK(VA45zyCC1B^BhD}# zTZoD%AuK;uBG2*F*HraA&8r&^8Y{4lUy_<@a*WvNFV4k_ zW5pEZ@f|36l*MU7y)$p7E>bicgTvQ8h~muGr^RWA6fhn=d}7J zHL_m#9sZn*`lj~i9XDAo`0H5h_+CQ!(mDk6uNQX3y-ao&{DlC{(Z%7}KL5DC0Rml0 AWB>pF diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index e46aa5124..06802285d 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -136,7 +136,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .polls_btn_box02{ width:80px; margin:0 auto; padding-left:10px;} /***新增20150120***/ -.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -417px no-repeat;padding-left:7px; color:#fff;} +.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -372px no-repeat;padding-left:7px; color:#fff;} a.btn_de{ border:1px solid #ff5d31; color:#ff5d31; } a:hover.btn_de{ background:#ff5d31;} a.btn_pu{ border:1px solid #3cb761; color:#3cb761; } From a53831a6b5f35f107bd4087b020ef6a984bda3f9 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 11:44:49 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B=E9=97=AE=E5=8D=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9C=81=E7=95=A5=E5=8F=B7=E8=BF=87=E6=97=A9=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb index cc7e88547..3290ff2dc 100644 --- a/app/views/poll/_poll.html.erb +++ b/app/views/poll/_poll.html.erb @@ -10,11 +10,11 @@ <% end %> <% else %> <% if has_commit && poll.polls_status == 2 %> - + <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %> <% elsif !has_commit && poll.polls_status == 2 %> - <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %> + <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %> <% end %> <% end %> From 77b8bf18c8f042c02f783e85c23246ef18c6929e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 11:50:33 +0800 Subject: [PATCH 10/31] =?UTF-8?q?#1842=20=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=8F=8F=E8=BF=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_edit_MCQ.html.erb | 2 +- app/views/poll/_new_MCQ.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb index 613fed371..129f50e94 100644 --- a/app/views/poll/_edit_MCQ.html.erb +++ b/app/views/poll/_edit_MCQ.html.erb @@ -18,7 +18,7 @@
    - + />
    diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb index de9dc9f08..027a1c1f6 100644 --- a/app/views/poll/_new_MCQ.html.erb +++ b/app/views/poll/_new_MCQ.html.erb @@ -3,7 +3,7 @@
    - +
    From f01d164295ea186cf827a4e551baed20b9b0ed61 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Wed, 21 Jan 2015 12:01:02 +0800 Subject: [PATCH 11/31] Signed-off-by: alan <547533434@qq.com> --- app/helpers/courses_helper.rb | 2 +- app/models/mailer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 95b049dc2..22eb9bfae 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -112,7 +112,7 @@ module CoursesHelper # end #获取课程所有成员 - def course_member course + def course_all_member course course.members end # 学生人数计算 diff --git a/app/models/mailer.rb b/app/models/mailer.rb index a2e742ee3..2cd069175 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -62,7 +62,7 @@ class Mailer < ActionMailer::Base course = journals_for_message.jour @author = journals_for_message.user #课程的教师 - @members = course_member journals_for_message.jour + @members = course_all_member journals_for_message.jour #收件人邮箱 @recipients ||= [] @members.each do |teacher| From 520e9c73aa34be5f9983f9bf1820f35311c91102 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 14:30:19 +0800 Subject: [PATCH 12/31] =?UTF-8?q?#1836=20=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=88=96=E8=80=85=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0403=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d3df57982..24a3ff19f 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -558,6 +558,11 @@ class ProjectsController < ApplicationController # Show @project def show + if(@project && !@project.is_public && !User.current.member_of?(@project)) + render_403 + return + end + @project_type = params[:project_type] # try to redirect to the requested menu item From 7ee17b6d7ceb038ee5d24f8045868237daefc275 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 15:43:15 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B7=A6=E8=BE=B9=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/polls.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 06802285d..e601d231d 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -19,7 +19,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;} /*问卷列表*/ -.polls_content{ width:615px;} +.polls_content{ width:615px;padding-left: 6px;} .polls_head{ width:677px; height:48px; background:#eaeaea;} .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;} .polls_head span{ font-weight:normal; color:#15bccf;} From d68486669e5712e268769fde68fceac04392d985 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 16:07:44 +0800 Subject: [PATCH 14/31] =?UTF-8?q?#1830=E8=AF=BE=E7=A8=8B--=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E4=BD=93=E5=8E=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/member.html.erb | 2 +- public/stylesheets/course_group.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 2599760ad..803be3731 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -56,7 +56,7 @@ <%= stylesheet_link_tag 'course_group', :media => 'all' %> -
    +
    <%= @subPage_title %> diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css index b6c7f4f8c..c160e1730 100644 --- a/public/stylesheets/course_group.css +++ b/public/stylesheets/course_group.css @@ -1,4 +1,4 @@ -body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;} +#member_of_course{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;} div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea,form{ margin:0; padding:0;} div,img,tr,td,textarea,form{ border:0;} table,tr,td{border:0; cellspacing:0; cellpadding:0;} From 54c8ee9d4d29ab264c3baa3deebd345ca0aabe3a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 21 Jan 2015 17:51:12 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=AD=94=E5=AE=8C=E9=97=AE=E5=8D=B7=E4=B9=8B=E5=90=8E=E3=80=82?= =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1=E7=AD=94=E9=A2=98?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 12 +++++-- app/helpers/poll_helper.rb | 2 +- app/views/poll/_poll.html.erb | 11 +++---- app/views/poll/_show_MCQ_result.html.erb | 26 +++++++++++++++ app/views/poll/_show_MC_result.html.erb | 27 ++++++++++++++++ app/views/poll/_show_mulit_result.html.erb | 20 ++++++++++++ app/views/poll/_show_single_result.html.erb | 18 +++++++++++ app/views/poll/poll_result.html.erb | 36 +++++++++++++++++++++ config/routes.rb | 1 + 9 files changed, 144 insertions(+), 9 deletions(-) create mode 100644 app/views/poll/_show_MCQ_result.html.erb create mode 100644 app/views/poll/_show_MC_result.html.erb create mode 100644 app/views/poll/_show_mulit_result.html.erb create mode 100644 app/views/poll/_show_single_result.html.erb create mode 100644 app/views/poll/poll_result.html.erb diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 42ab98e10..4abddaa5e 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -1,7 +1,7 @@ class PollController < ApplicationController - before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll] + before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result] before_filter :find_container, :only => [:new,:create, :index] - before_filter :is_member_of_course, :only => [:index,:show] + before_filter :is_member_of_course, :only => [:index,:show,:poll_result] before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll] include PollHelper def index @@ -330,6 +330,14 @@ class PollController < ApplicationController end end + #显示某个学生某份问卷的填写结果 + def poll_result + @poll_questions = paginateHelper @poll.poll_questions,5 + respond_to do |format| + format.html{render :layout => 'base_courses'} + end + end + private def find_poll_and_course @poll = Poll.find params[:id] diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb index 17ef02a36..60d82c096 100644 --- a/app/helpers/poll_helper.rb +++ b/app/helpers/poll_helper.rb @@ -73,5 +73,5 @@ module PollHelper "多行主观题" end end - + end \ No newline at end of file diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb index 3290ff2dc..c53f09361 100644 --- a/app/views/poll/_poll.html.erb +++ b/app/views/poll/_poll.html.erb @@ -1,20 +1,19 @@ <% has_commit = has_commit_poll?(poll.id ,User.current)%> +<% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
  • <% if @is_teacher %> <% if has_commit %> - <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%> + <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %> <% else %> - <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %> + <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl" %> <% end %> <% else %> <% if has_commit && poll.polls_status == 2 %> - - <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %> - + <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 500px;width: auto;" %> <% elsif !has_commit && poll.polls_status == 2 %> - <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %> + <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %> <% end %> <% end %>
    • diff --git a/app/views/poll/_show_MCQ_result.html.erb b/app/views/poll/_show_MCQ_result.html.erb new file mode 100644 index 000000000..f46882881 --- /dev/null +++ b/app/views/poll/_show_MCQ_result.html.erb @@ -0,0 +1,26 @@ +
  • +
    + + 第<%= poll_question.question_number%>题： + + <%= poll_question.question_title %> + [多选题] + <%if poll_question.is_necessary == 1%> + * + <%end%> +
    +
    +
    + + + <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%> + + + + <% end%> + +
    + <%= answer.poll_answer.answer_text %> +
    +
    +
    • \ No newline at end of file diff --git a/app/views/poll/_show_MC_result.html.erb b/app/views/poll/_show_MC_result.html.erb new file mode 100644 index 000000000..7f2cbbd83 --- /dev/null +++ b/app/views/poll/_show_MC_result.html.erb @@ -0,0 +1,27 @@ +
  • +
    + + 第<%= poll_question.question_number%>题： + + <%= poll_question.question_title %> + [单选题] + <%if poll_question.is_necessary == 1%> + * + <%end%> +
    +
    +
    + + + <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%> + + + + <% end%> + + +
    + <%= answer.poll_answer.answer_text %> +
    +
    +
    • \ No newline at end of file diff --git a/app/views/poll/_show_mulit_result.html.erb b/app/views/poll/_show_mulit_result.html.erb new file mode 100644 index 000000000..e54cca505 --- /dev/null +++ b/app/views/poll/_show_mulit_result.html.erb @@ -0,0 +1,20 @@ +
  • +
    +
    + + 第<%= poll_question.question_number%>题： + + <%= poll_question.question_title %> + [多行主观] + <%if poll_question.is_necessary == 1%> + * + <%end%> +
    +
    +
    +

    + <%= get_anwser_vote_text poll_question.id,User.current.id%> +

    +
    +
    +
    • \ No newline at end of file diff --git a/app/views/poll/_show_single_result.html.erb b/app/views/poll/_show_single_result.html.erb new file mode 100644 index 000000000..07559773d --- /dev/null +++ b/app/views/poll/_show_single_result.html.erb @@ -0,0 +1,18 @@ +
  • +
    + + 第<%= poll_question.question_number%>题： + + <%= poll_question.question_title %> + [单行主观] + <%if poll_question.is_necessary == 1%> + * + <%end%> +
    +
    +
    +

    + <%= get_anwser_vote_text poll_question.id,User.current.id%> +

    +
    +
    • \ No newline at end of file diff --git a/app/views/poll/poll_result.html.erb b/app/views/poll/poll_result.html.erb new file mode 100644 index 000000000..a7cb415b3 --- /dev/null +++ b/app/views/poll/poll_result.html.erb @@ -0,0 +1,36 @@ +<%= stylesheet_link_tag 'polls', :media => 'all' %> +
    +
    +

    + <%= @poll.polls_name.empty? ? l(:label_poll_new) : @poll.polls_name %> +

    +

    + <%= @poll.polls_description%> +

    +
    +
    +
      + <% @poll_questions.each do |poll_question|%> + <% if poll_question.question_type == 1%> + <%= render :partial => 'show_MC_result', :locals => {:poll_question => poll_question} %> + <% elsif poll_question.question_type == 2%> + <%= render :partial => 'show_MCQ_result', :locals => {:poll_question => poll_question} %> + <% elsif poll_question.question_type == 3%> + <%= render :partial => 'show_single_result', :locals => {:poll_question => poll_question} %> + <% elsif poll_question.question_type == 4%> + <%= render :partial => 'show_mulit_result', :locals => {:poll_question => poll_question} %> + <% end%> + <% end%> +
    +
    +
    + + +
    +
      + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
    +
    +
    +
    + diff --git a/config/routes.rb b/config/routes.rb index 67b0118b0..524373378 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do post 'commit_poll' get 'publish_poll' get 'republish_poll' + get 'poll_result' end collection do delete 'delete_poll_question' From 3279928bef0cb9256d4d651f97841dce515f941a Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 21 Jan 2015 18:12:04 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/mailer.html.erb | 4 +-- app/views/mailer/_issue.html.erb | 14 +++++------ app/views/mailer/_issue.text.erb | 14 +++++------ app/views/mailer/issue_add.html.erb | 2 +- app/views/mailer/issue_add.text.erb | 2 +- app/views/mailer/issue_edit.html.erb | 22 ++++++++++------- app/views/mailer/issue_edit.text.erb | 4 +-- app/views/my/account.html.erb | 26 ++++++++++---------- app/views/users/_mail_notifications.html.erb | 2 +- config/locales/en.yml | 16 +++++++++++- config/locales/zh.yml | 15 +++++++++++ 11 files changed, 77 insertions(+), 44 deletions(-) diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index b80206728..a05eacbd1 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -11,7 +11,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ ma div,img,tr,td,table{ border:0;} table,tr,td{border:0;cellspacing:0; cellpadding:0;} ol,ul,li{ list-style-type:none} -.cl{ clear:both; overflow:hidden; } +.cl{ clear:both; overflow:hidden; margin-top: 30px;} a{ text-decoration:none; } a:hover{ text-decoration:underline; } .mail_box,ul,li{ list-style-type:none} @@ -35,7 +35,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
    -

    亲爱的Trustie用户，您好！

    +

    <%= l(:mail_issue_greetings)%>

    <%= yield %>
    diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb index 5979877a3..c97c82426 100644 --- a/app/views/mailer/_issue.html.erb +++ b/app/views/mailer/_issue.html.erb @@ -2,19 +2,19 @@

    <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %> - 在 - <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！

    + <%= l(:mail_issue_title_userin)%> + <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>

      -
    • 标题：<%= link_to(issue.subject, issue_url) %>
      • -
    • 来源：<%= issue.project.name %>| 项目<%= issue.tracker.name%>
      • -
    • 内容： +
    • <%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
      • +
    • <%= l(:mail_issue_sent_from)%><%= issue.project.name %>| <%= l(:mail_issue_from_project)%>
      • +
    • <%= l(:mail_issue_content)%> <%= issue.description %>
    • <% unless @issue.attachments.nil? %> - 附件： + <%= l(:mail_issue_attachments)%> <% @issue.attachments.each do |attach| %>

      <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %>

      @@ -25,7 +25,7 @@
    - +
    +
    +
    + + + diff --git a/app/views/projects/join_project.js.erb b/app/views/projects/join_project.js.erb new file mode 100644 index 000000000..f3bdfb50a --- /dev/null +++ b/app/views/projects/join_project.js.erb @@ -0,0 +1,9 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/join_project') %>'); +showModal('ajax-modal', '510px'); +$('#ajax-modal').css('height','260px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().removeClass("alert_praise"); +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("alert_box"); diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 0dc62c6a3..3e341bd27 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -66,6 +66,9 @@ :course => 0, :project_type =>( @project_type||=0)}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> +      + <%= link_to l(:label_join_project), join_project_projects_path ,:remote => true, :class => 'icon icon-add' %> +      <% end %>
    diff --git a/config/locales/zh.yml b/config/locales/zh.yml index bd6c6dc22..fbdee1d1f 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2282,4 +2282,5 @@ zh: label_answer: 答案： label_poll_answer_valid_result: 以上为有效问答题答案！ label_answer_total: 总计： + label_join_project: 加入项目 diff --git a/config/routes.rb b/config/routes.rb index 524373378..65498e4ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -377,6 +377,10 @@ RedmineApp::Application.routes.draw do match 'copy', :via => [:get, :post] end + collection do + match 'join_project', :via => [:get, :post] + end + #by young match '/member', :to => 'projects#member', :as => 'member', :via => :get match '/file', :to => 'projects#file', :as => 'file', :via => :get From 8f1249390a46a1804fc8bd659cdbc451f070a741 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 22 Jan 2015 17:31:34 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=A4=9A=E5=B0=81=E7=9B=B8=E5=90=8C=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 11 ++++++++--- app/models/project.rb | 2 +- app/views/mailer/issue_edit.html.erb | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 02684a187..23ac36054 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -147,8 +147,10 @@ class Mailer < ActionMailer::Base @project_url = url_for(:controller => 'projects', :action => 'show', :id => issue.project_id, :token => @token.value) @user_url = url_for(my_account_url(user,:token => @token.value)) - - cc = issue.watcher_recipients - issue.recipients + cc = nil + if recipients == issue.recipients[0] + cc = issue.watcher_recipients - issue.recipients + end subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}" mail(:to => recipients, :cc => cc, @@ -197,8 +199,11 @@ class Mailer < ActionMailer::Base # Watchers in cc + cc = nil + if recipients == journal.recipients[0] + cc = journal.watcher_recipients - journal.recipients + end - cc = journal.watcher_recipients - journal.recipients s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] " s << "(#{issue.status.name}) " if journal.new_value_for('status_id') s << issue.subject diff --git a/app/models/project.rb b/app/models/project.rb index 01e6cd91c..14763347f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -600,7 +600,7 @@ class Project < ActiveRecord::Base # Returns the users that should be notified on project events def notified_users # TODO: User part should be extracted to User#notify_about? - members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all' || m.principal.mail_notification == 'only_my_events' ||m.principal.mail_notification == 'selected')}.collect {|m| m.principal} + members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal} end # Returns an array of all custom fields enabled for project issues diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb index 6fcb0ddb5..af167cff5 100644 --- a/app/views/mailer/issue_edit.html.erb +++ b/app/views/mailer/issue_edit.html.erb @@ -12,7 +12,7 @@ <%= l(:field_content)%>：<%= @journal.notes %>
    -
    + <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
    <%= link_to( l(:mail_issue_footer), @user_url) %>
    From 84bfd30fc510ec57dd044ef2bad5664ba1142261 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 22 Jan 2015 17:46:12 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=BC=B9=E6=A1=86=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 289 ++++++++++++---------- config/locales/zh.yml | 3 +- public/images/blue_line.png | Bin 0 -> 2819 bytes public/images/sidebar_bg.png | Bin 0 -> 9419 bytes 4 files changed, 164 insertions(+), 128 deletions(-) create mode 100644 public/images/blue_line.png create mode 100644 public/images/sidebar_bg.png diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 52006e94d..ae85d9479 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -1,49 +1,122 @@ - - - - -意见反馈浮窗 + - + + + + +意见反馈 + + + - - -
    -
    - - <% get_memo %> - <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> -
    -

    - <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> -

    -

    - <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> -

    - <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - 提  交 - <% end %> -
    - - - -
    + + +
    +
    +
    +
    <%= l(:label_feedback) %>
    +
    +
    + <% get_memo %> + <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> + <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> + <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> + <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> + 提  交 + <% end %> +
    +
    +

    + <%= l(:label_technical_support) %>黄井泉
    + <%= l(:label_technical_support) %>白   羽 +

    +
    +
    +
    +
    +
    +
    提交
    - -
    -
    技术支持：
    -

    <%= l(:label_course_adcolick) %>黄井泉
    - <%= l(:label_course_adcolick) %>白羽

    -
    - -
    + + - - - + \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index bd6c6dc22..fad70aabd 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2282,4 +2282,5 @@ zh: label_answer: 答案： label_poll_answer_valid_result: 以上为有效问答题答案！ label_answer_total: 总计： - + label_technical_support: 技术支持： + label_feedback: 意见反馈 diff --git a/public/images/blue_line.png b/public/images/blue_line.png new file mode 100644 index 0000000000000000000000000000000000000000..4ae87f34320f80b3839409e80f275f205369f5e8 GIT binary patch literal 2819 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 V1*1Is;UEA2002ovPDHLkV1lWASCaq$ literal 0 HcmV?d00001 diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..e41ea789d541cffeab9bdeed534fd1ffb17830da GIT binary patch literal 9419 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 Date: Thu, 22 Jan 2015 20:41:42 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E5=A4=9A=E7=A7=8D=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/mailer.html.erb | 28 +++++++++------- app/views/mailer/_issue.html.erb | 48 ++++++++++++++++------------ app/views/mailer/_issue.text.erb | 4 +++ app/views/mailer/issue_add.html.erb | 4 +-- app/views/mailer/issue_edit.html.erb | 14 ++------ app/views/mailer/issue_edit.text.erb | 8 ----- 6 files changed, 54 insertions(+), 52 deletions(-) diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index a05eacbd1..abb896b61 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -10,37 +10,43 @@ body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; back div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;} div,img,tr,td,table{ border:0;} table,tr,td{border:0;cellspacing:0; cellpadding:0;} +.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; } ol,ul,li{ list-style-type:none} .cl{ clear:both; overflow:hidden; margin-top: 30px;} -a{ text-decoration:none; } -a:hover{ text-decoration:underline; } .mail_box,ul,li{ list-style-type:none} -.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; } .mail a{color:#1b55a7; font-weight: bold; } .mail_content{ margin-top:30px;} .c_blue{ color:#1b55a7;} .mail_box{ border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;} .mail_box_p{ float:left; display: block; width:527px;} -a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;} -a:hover.mail_reply{ background:#06a9bc; text-decoration:none;} .mail_fujian{ float:left; width:527px; display: block; } .mail_fujian a{ font-weight:normal; font-size:12px;} .mail_foot a{ font-size:12px; font-weight:normal;} +a{ text-decoration:none; } +a:hover{ text-decoration:underline; } +a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;} +a:hover.mail_reply{ background:#06a9bc; text-decoration:none;} + + + + + - -
    -
    -
    + + +
    +
    +

    <%= l(:mail_issue_greetings)%>

    <%= yield %>
    - <%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %> + <%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %>
    -
    +
    diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb index c97c82426..d11248aff 100644 --- a/app/views/mailer/_issue.html.erb +++ b/app/views/mailer/_issue.html.erb @@ -1,32 +1,40 @@

    - - <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %> + + <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %> <%= l(:mail_issue_title_userin)%> - <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>

    -
    -
      -
    • <%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
      • -
    • <%= l(:mail_issue_sent_from)%><%= issue.project.name %>| <%= l(:mail_issue_from_project)%>
      • -
    • <%= l(:mail_issue_content)%> - <%= issue.description %> + <%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %><%= l(:mail_issue_title_active)%>

      +
      +
        +
      • <%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %>
        • +
      • <%= l(:mail_issue_sent_from)%><%= issue.project.name %>| <%= l(:mail_issue_from_project)%>
        • +
      • <%= l(:mail_issue_content)%> + + <% if @journal.nil? %> + <%= issue.description %> + <% else %> + <%= @journal.notes %> + <% end%> +
        • -
      • +
      • - <% unless @issue.attachments.nil? %> - <%= l(:mail_issue_attachments)%> - + <% unless @issue.attachments.nil? %> + <%= l(:mail_issue_attachments)%> + <% @issue.attachments.each do |attach| %> -

        <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %>

        - <% end %>         - <% end %> +

        <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%>

        + <% end %>         + <% end %> -
        • +
      -
      - -
      +
      + +
      ����[left or right] -// minStatue --> ��С״̬��ֻ��show_btn -// skin --> Ƥ������ -// durationTime --> ���ʱ�� -//���� : +// ???? : float --> ????[left or right] +// minStatue --> ??С???????show_btn +// skin --> ??????? +// durationTime --> ?????? +//???? : $("#scrollsidebar2").fix({ - float : 'right', //default.left or right - minStatue : true, //default.false or true - skin : 'green', //default.gray or yellow ��blue ��green ��orange ��white + float : 'right', //default.left or right + minStatue : true, //default.false or true + skin : 'green', //default.gray or yellow ??blue ??green ??orange ??white durationTime : 1000 // }); // @@ -66,53 +66,53 @@ a:hover.opnionButton{ text-decoration:underline;} float : 'left', minStatue : false, skin : 'blue', - durationTime : 1000 + durationTime : 1000 } - var options = $.extend(defaults, options); + var options = $.extend(defaults, options); - this.each(function(){ - //��ȡ���� + this.each(function(){ + //??????? var thisBox = $(this), closeBtn = thisBox.find('.close_btn' ), show_btn = thisBox.find('.show_btn' ), sideContent = thisBox.find('.side_content'), sideList = thisBox.find('.side_list') - ; - var defaultTop = thisBox.offset().top; //�����Ĭ��top - - thisBox.css(options.float, 0); + ; + var defaultTop = thisBox.offset().top; //????????top + + thisBox.css(options.float, 0); if(options.minStatue){ $(".show_btn").css("float", options.float); sideContent.css('width', 0); show_btn.css('width', 25); - + } - //Ƥ������ + //??????? if(options.skin) thisBox.addClass('side_'+options.skin); - - - //����scroll�¼� + + + //????scroll??? $(window).bind("scroll",function(){ var offsetTop = defaultTop + $(window).scrollTop() + "px"; thisBox.animate({ top: offsetTop }, { - duration: options.durationTime, - queue: false //�˶����������붯������ + duration: options.durationTime, + queue: false //??????????????????? }); - }); - //close�¼� + }); + //close??? closeBtn.bind("click",function(){ sideContent.animate({width: '0px'},"fast"); show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast"); }); - //show�¼� + //show??? show_btn.click(function() { $(this).animate({width: '0px'},"fast"); sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); }); - + }); //end this.each }; @@ -132,36 +132,34 @@ function f_submit() } - + 意见反馈 - - - + - +
      <%= l(:label_feedback) %>
      -
      -
      +
      +
      <% get_memo %> <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> - <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> + <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - 提  交 - <% end %> -
      + 提  交 + <% end %> +
      -

      +

      <%= l(:label_technical_support) %>黄井泉
      <%= l(:label_technical_support) %>白   羽 -

      +

      @@ -169,9 +167,9 @@ function f_submit()
      提交
      - - + \ No newline at end of file diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index b3fae8b4a..df4859613 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -59,7 +59,7 @@ { $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>'); showModal('ajax-modal', '310px'); - $('#ajax-modal').css('height','110px'); + $('#ajax-modal').css('height','115px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index e601d231d..863ee5864 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -14,9 +14,9 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi #polls .fr{ float:right;} /*问卷按钮*/ -.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; padding:7px 0 0 15px; } -.polls_btn a{font-size:14px; color:#444444;font-weight:bold;} -.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;} +/*.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; padding:7px 0 0 15px; }*/ +/*.polls_btn a{font-size:14px; color:#444444;font-weight:bold;}*/ +/*.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}*/ /*问卷列表*/ .polls_content{ width:615px;padding-left: 6px;} From 81f5a5e624b547eb301382ae2204e98a8fdb256f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 23 Jan 2015 09:28:01 +0800 Subject: [PATCH 26/31] =?UTF-8?q?#1854=E5=AD=A6=E7=94=9F=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E6=8F=90=E4=BA=A4=E8=BF=87=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=97=B6=EF=BC=8C=E5=A4=9A=E8=A1=8C=E4=B8=BB?= =?UTF-8?q?=E8=A7=82=E9=A2=98=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=9C=89html?= =?UTF-8?q?=E5=85=83=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_show_mulit_result.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/poll/_show_mulit_result.html.erb b/app/views/poll/_show_mulit_result.html.erb index e54cca505..786ed9460 100644 --- a/app/views/poll/_show_mulit_result.html.erb +++ b/app/views/poll/_show_mulit_result.html.erb @@ -13,7 +13,7 @@

      - <%= get_anwser_vote_text poll_question.id,User.current.id%> + <%= get_anwser_vote_text(poll_question.id,User.current.id).html_safe%>

      From 249b08392d548cf97c999b7f4615173a2319a17c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 23 Jan 2015 09:31:30 +0800 Subject: [PATCH 27/31] =?UTF-8?q?#1856=20=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=97=AE=E5=8D=B7=E3=80=81=E5=8F=96=E6=B6=88=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E5=90=8E=E5=BC=B9=E5=87=BA=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index de30b5deb..a8aca1308 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -15,7 +15,7 @@ "
      " + "
    "); showModal('ajax-modal', '310px'); - $('#ajax-modal').css('height','110px'); + $('#ajax-modal').css('height','115px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); @@ -41,7 +41,7 @@ "
    " + "
    "); showModal('ajax-modal', '310px'); - $('#ajax-modal').css('height','110px'); + $('#ajax-modal').css('height','115px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); From f74f2e3be77198c2ae6f8fc09219390db3dce8c6 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 23 Jan 2015 09:34:15 +0800 Subject: [PATCH 28/31] =?UTF-8?q?exec=E6=8C=89=E9=92=AE=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 --- public/stylesheets/nyan.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index c532e7112..ac7142c71 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -1433,8 +1433,8 @@ ul.contest-notification-list li span{ } .xls { - background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent; - padding: 2px 0px 3px 16px; + /*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;*/ + /*padding: 2px 0px 3px 16px;*/ font-family:微软雅黑 !important; font-size: 12px !important; color: #136b3b !important; From ae31d0b8610177c32bcce657742f5f1a064ea88b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 23 Jan 2015 09:42:08 +0800 Subject: [PATCH 29/31] =?UTF-8?q?#1851=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_homework_show.html.erb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 49325c0d4..1009f405f 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -56,12 +56,21 @@ <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %> - + <% if User.current.logged? && is_cur_course_student(@course) %> <% cur_user_homework = cur_user_homework_for_bid(bid) %> - 匿评中.. + <% if bid.open_anonymous_evaluation == 1 %> + <% case bid.comment_status %> + <% when 0 %> + 未开启匿评 + <% when 1 %> +   匿评中..   + <% when 2 %> +   匿评结束   + <% end %> + <% end%> <% if cur_user_homework && cur_user_homework.empty? %> From c6deffe245aceaf9ef69b932e384756bba578f18 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 23 Jan 2015 09:47:13 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index ae85d9479..748029ee2 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -24,7 +24,7 @@ html{ overflow-x:hidden;} .msgserver { margin:10px 0 4px 4px;} .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -115px; padding-left:22px;} .opnionText{ width:120px; height:180px; border-color:#cecece; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; color:#999; padding:3px;} -a.opnionButton{ display:block; color:#fd6e2a; font-weight: bold; margin:-25px auto 0; text-align:center;} +a.opnionButton{ display:block; font-weight: bold; margin:-25px auto 0; text-align:center;} a:hover.opnionButton{ text-decoration:underline;} @@ -154,13 +154,13 @@ function f_submit() <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - 提  交 + 提  交 <% end %>

    - <%= l(:label_technical_support) %>黄井泉
    - <%= l(:label_technical_support) %>白   羽 + <%= l(:label_technical_support) %>黄井泉
    + <%= l(:label_technical_support) %>白   羽

    From 3911450787ea8d6115f75d1dc277a0d835a9c855 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 23 Jan 2015 09:51:36 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E7=AE=80=E7=AD=94=E9=A2=98=E8=BE=93=E5=85=A5=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=98=BE=E7=A4=BA=E8=B6=85=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 12 ++++++++++++ public/stylesheets/polls.css | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 7d10abc35..d0d755bd3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150121030451) do add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" add_index "activities", ["user_id"], :name => "index_activities_on_user_id" + create_table "api_keys", :force => true do |t| + t.string "access_token" + t.datetime "expires_at" + t.integer "user_id" + t.boolean "active", :default => true + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" + add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" + create_table "applied_projects", :force => true do |t| t.integer "project_id", :null => false t.integer "user_id", :null => false diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index e601d231d..3870db84c 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -53,7 +53,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} .ur_inputs label{ padding-left:10px;word-break: break-all; word-wrap: break-word;} .ur_inputs input{ margin-right:5px;} .ur_text{ height:30px;} -.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765;} +.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765; word-break:break-all; word-wrap:break-word;} .ur_buttons{ width:250px; margin:20px auto 10px;} a.ur_button{ display:block; width:106px; height:37px; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px; float:left; margin-right:15px;} a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}