From af7e605f7687f4341df236c83a61f9d5dbba1b39 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 29 Jan 2015 16:13:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E2=80=9C=E6=8F=90=E4=BA=A4=E2=80=9D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=92=8C=E2=80=9C=E5=8F=96=E6=B6=88=E2=80=9D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B9=8B=E9=97=B4=E6=9C=89=E4=B8=80=E7=AB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/_form.html.erb | 23 ++++++++++++++++++----- app/views/news/_project_news.html.erb | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb index f76aaad88..5e5cdf532 100644 --- a/app/views/news/_form.html.erb +++ b/app/views/news/_form.html.erb @@ -3,12 +3,25 @@ <%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
-

<%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onkeyup => "regexTitle();" %>

-

(60个字符以内)

+

+ <%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onkeyup => "regexTitle();" %> +

+

+ (60个字符以内) +

-

<%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onkeyup => "regexDescription();" %>

-

-

<%= render :partial => 'attachments/form', :locals => {:container => @news} %>

+

+ <%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onkeyup => "regexDescription();" %> +

+

+ +

+

+ + <%= render :partial => 'attachments/form', :locals => {:container => @news} %> +

<%= wikitoolbar_for 'news_description' %> diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb index 526c7a1a5..b18c2abd8 100644 --- a/app/views/news/_project_news.html.erb +++ b/app/views/news/_project_news.html.erb @@ -83,7 +83,7 @@ <%= render :partial => 'news/form', :locals => {:f => f} %> <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %> <%= link_to l(:button_create), "#", :onclick => 'submitNews();',:onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %> - | + <%#= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %> From bf75f329037e2c976fc9b4684d858587fd75873e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 29 Jan 2015 16:22:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E7=95=99=E8=A8=80=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F=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/layouts/base_homework.html.erb | 1 + public/stylesheets/css.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index b583fcad6..f1840c2fd 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -31,6 +31,7 @@ text-align: center; padding-left: 5px !important; padding-right: 5px !important; + line-height: 1.9; } .span_wping a:hover{ background-color:#03a1b3;} diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 444d0d383..d53b6ec02 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -1,5 +1,5 @@ /* CSS Document */ -body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;} +#content{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; 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{ margin:0; padding:0;} div,img,tr,td,textarea{ border:0;} table,tr,td{border:0; cellspacing:0; cellpadding:0;} From b71d71410328d7dabad40ea2729e621ba5f4cc4e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 29 Jan 2015 16:39:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?#1887=20=E7=94=A8=E6=88=B7=E8=81=8C?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 11 ++++- app/views/layouts/base_users.html.erb | 60 ++++----------------------- 2 files changed, 17 insertions(+), 54 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1face5c38..8254c5313 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1963,6 +1963,15 @@ module ApplicationHelper end def get_technical_title user - #user.user_extensions.technical_title + if user.user_extensions.technical_title == "Professor" || user.user_extensions.technical_title == "教授" + technical_title = l(:label_technicl_title_professor) + elsif user.user_extensions.technical_title == "Associate professor" || user.user_extensions.technical_title == "副教授" + technical_title = l(:label_technicl_title_associate_professor) + elsif user.user_extensions.technical_title == "Lecturer" || user.user_extensions.technical_title == "讲师" + technical_title = l(:label_technicl_title_lecturer) + elsif user.user_extensions.technical_title == "Teaching assistant" || user.user_extensions.technical_title == "助教" + technical_title = l(:label_technicl_title_teaching_assistant) + end + technical_title end end diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index dbd6503b0..3b2bd8dfe 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -21,8 +21,6 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - <% title1 = @user.user_extensions.technical_title %> - <% language1 = @user.language %> - +
@@ -283,10 +233,14 @@ <% if @user.user_extensions.identity == 0 %> - <%= l(:label_technical_title) %>： + + <%= l(:label_technical_title) %>： + - + + <%= get_technical_title @user %> + <% end %> From 108435f9334f5b66b9113bc3538ffa6acb31f98b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 29 Jan 2015 16:53:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=87=E9=A2=98=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA=E7=9A=84js=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_new_MC.html.erb | 2 +- app/views/poll/_new_MCQ.html.erb | 2 +- app/views/poll/_new_mulit.html.erb | 2 +- app/views/poll/_new_single.html.erb | 2 +- app/views/poll/_poll_form.html.erb | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb index 294c058f8..b4624bbb5 100644 --- a/app/views/poll/_new_MC.html.erb +++ b/app/views/poll/_new_MC.html.erb @@ -34,7 +34,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb index 1478f9918..9cf6170c0 100644 --- a/app/views/poll/_new_MCQ.html.erb +++ b/app/views/poll/_new_MCQ.html.erb @@ -33,7 +33,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb index 23ffb3d64..48122bad0 100644 --- a/app/views/poll/_new_mulit.html.erb +++ b/app/views/poll/_new_mulit.html.erb @@ -13,7 +13,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb index 4ee185070..f2137b348 100644 --- a/app/views/poll/_new_single.html.erb +++ b/app/views/poll/_new_single.html.erb @@ -8,7 +8,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index 4742028d5..eec669509 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -23,6 +23,14 @@ $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>"); $("#poll_questions_title").focus(); } + + //确定按钮 + function add_poll_question(obj) + { + var title = $.trim($("#poll_questions_title").val()); + if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();} + } + //问卷头 function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();} function pollsSubmit(doc){ From a772ef329d30d22dbdd4d3ada3a501588ac25353 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 29 Jan 2015 17:01:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=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/_edit_MC.html.erb | 2 +- app/views/poll/_edit_MCQ.html.erb | 2 +- app/views/poll/_edit_mulit.html.erb | 2 +- app/views/poll/_edit_single.html.erb | 2 +- app/views/poll/_poll_form.html.erb | 8 +++++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb index f89407247..19a1e1e89 100644 --- a/app/views/poll/_edit_MC.html.erb +++ b/app/views/poll/_edit_MC.html.erb @@ -39,7 +39,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb index d6045f965..508835d7d 100644 --- a/app/views/poll/_edit_MCQ.html.erb +++ b/app/views/poll/_edit_MCQ.html.erb @@ -36,7 +36,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb index 5c694ff05..f3f121784 100644 --- a/app/views/poll/_edit_mulit.html.erb +++ b/app/views/poll/_edit_mulit.html.erb @@ -20,7 +20,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb index 5aff29984..eadf5b00d 100644 --- a/app/views/poll/_edit_single.html.erb +++ b/app/views/poll/_edit_single.html.erb @@ -16,7 +16,7 @@
- + <%= l(:label_button_ok)%> diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index eec669509..05ca1e61f 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -24,12 +24,18 @@ $("#poll_questions_title").focus(); } - //确定按钮 + //添加标题时确定按钮 function add_poll_question(obj) { var title = $.trim($("#poll_questions_title").val()); if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();} } + //修改标题时确定按钮 + function edit_poll_question(obj,id) + { + var title = $.trim($("#poll_questions_title_" + id).val()); + if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();} + } //问卷头 function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();} From c366cc90e7c4453dcc35b73f27852d74f3bba806 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 29 Jan 2015 17:33:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=90=8E=E7=9B=B8=E5=85=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 6 ++++++ app/views/poll/_poll_list.html.erb | 22 ++++++++++++++++++++++ app/views/poll/destroy.js.erb | 5 +---- app/views/poll/index.html.erb | 24 +----------------------- 4 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 app/views/poll/_poll_list.html.erb diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 394c52f13..1b2794034 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -83,6 +83,12 @@ class PollController < ApplicationController def destroy if @poll && @poll.destroy + if @is_teacher + polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}") + else + polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2") + end + @polls = paginateHelper polls,20 #分页 respond_to do |format| format.js end diff --git a/app/views/poll/_poll_list.html.erb b/app/views/poll/_poll_list.html.erb new file mode 100644 index 000000000..f57a4a5ff --- /dev/null +++ b/app/views/poll/_poll_list.html.erb @@ -0,0 +1,22 @@ +
+

所有问卷 + （<%= @obj_count%>） +

+ <% if @is_teacher%> + <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %> + <% end%> +
+
+
+ <% @polls.each do |poll|%> +
    + <%= render :partial => 'poll', :locals => {:poll => poll} %> +
+
+ <% end%> + +
    + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
+
+
\ No newline at end of file diff --git a/app/views/poll/destroy.js.erb b/app/views/poll/destroy.js.erb index cf94b5661..8bb67f20a 100644 --- a/app/views/poll/destroy.js.erb +++ b/app/views/poll/destroy.js.erb @@ -1,4 +1 @@ -<% if @poll%> - $("#polls_<%= @poll.id%>").remove(); -<%else%> -<% end %> \ No newline at end of file +$("#polls").html("<%= escape_javascript(render :partial => 'poll_list') %>"); \ No newline at end of file diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index 3db4d7caa..0b780aa9e 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -82,27 +82,5 @@ }
-
-

所有问卷 - （<%= @obj_count%>） -

- <% if @is_teacher%> - <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %> - <% end%> -
-
-
- <% @polls.each do |poll|%> -
    - <%= render :partial => 'poll', :locals => {:poll => poll} %> -
-
- <% end%> - -
    - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
-
-
- + <%= render :partial => 'poll_list'%>
\ No newline at end of file