");
- $('#ajax-modal').parent().removeClass("alert_praise");
- $('#ajax-modal').parent().css("top","").css("left","");
- $('#ajax-modal').parent().addClass("popbox_polls");
+ var title = $.trim($("#polls_name_h").html());
+ if(title.length == 0)
+ {
+ alert("问卷标题不能为空");
+ }
+ else{
+ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
+ showModal('ajax-modal', '310px');
+ $('#ajax-modal').css('height','115px');
+ $('#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/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index 7ab16b24d..ce74dc10a 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,7 +1,7 @@
- <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%> + <%= poll.polls_name%>
<%= @poll.polls_description%> diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index a8aca1308..3962768da 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -26,28 +26,35 @@ function clickCanel(){hideModal("#popbox02");} - function poll_submit(poll_id) + function poll_submit(poll_id,poll_name) { - $('#ajax-modal').html("
" +
- "
");
+ showModal('ajax-modal', '310px');
+ $('#ajax-modal').css('height','115px');
+ $('#ajax-modal').siblings().remove();
+ $('#ajax-modal').before("" +
+ "" +
- "
" +
+ "" +
+ if(poll_name == 0)
+ {
+ alert("问卷标题不能为空");
+ }
+ else
+ {
+ $('#ajax-modal').html("");
- $('#ajax-modal').parent().removeClass("alert_praise");
- $('#ajax-modal').parent().css("top","").css("left","");
- $('#ajax-modal').parent().addClass("popbox_polls");
+ "
" +
+ "" +
+ "" +
- "
");
- showModal('ajax-modal', '310px');
- $('#ajax-modal').css('height','115px');
- $('#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");
+ "");
+ $('#ajax-modal').parent().removeClass("alert_praise");
+ $('#ajax-modal').parent().css("top","").css("left","");
+ $('#ajax-modal').parent().addClass("popbox_polls");
+ }
}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a7d98a21c..036410a25 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -345,7 +345,7 @@ en:
field_identity_url: OpenID URL
field_content: Content
field_group_by: Group results by
- field_sharing: Sharing
+ field_sharing: Sharinglable_hot_course
field_parent_issue: Parent task
field_member_of_group: "Assignee's group"
field_assigned_to_role: "Assignee's role"
@@ -536,6 +536,70 @@ en:
project_module_boards: Forums
project_module_calendar: Calendar
project_module_gantt: Gantt
+
+ #edit by meng
+ lable_hot_course: Hot projects
+ lable_hot_projects: Active courses
+ lable_user_active: User movements
+ lable_bar_active: Bar posts
+ label_project_score: Score
+ label_course_join_student: Join a course
+ label_join_project: Join a project
+ label_contest_modify_settings: Configuration
+ bale_news_notice: Add a notification
+ label_field_correct: correct input
+ label_work_description_lengthlimit: less than 500 characters
+ label_create_new_projects: Create a project
+ label_work_scores_people: The total number of users given scores
+ label_project_new_description: A project can be used to do anything that requires distributed collaboration
+ label_project_grade: Score
+ label_user_for_project_grade: Score
+ label_relation_files: Select an existing resource
+
+ label_my_brief_introduction: How are feeling today? Leave your footprints ~
+ label_submit: Submit
+
+ label_tags_course_name: Course Title
+ label_new_course_password: Password
+ label_new_course_description: Description
+ field_open_student: Student list is public?
+ label_course_board: Forum
+ label_course_open_student_info: (Tick as "open list of students," if not open, the external person couldn't see the list of students)
+ label_teacher_list: Teacher list
+ label_student_list: Student list
+ label_export_excel: Export list
+
+ label_course_organizers: Institute
+ label_poll: Questionnaire
+
+ field_open_anonymous_evaluation: Use anonymous mutual-evaluation
+ field_evaluation_num: Number of anonymous works sent to each student
+
+ label_edit_homework: Update homework
+ label_homework_list: Work list
+
+ label_teacher_score: Teacher's score
+ label_time: Commit time
+ label_student_score: Student's score
+ label_without_score: No evaluated
+ label_homework_description: Description
+ label_responses: Messages
+
+ lable_has_commit_homework: You have submitted your work
+
+
+ label_user_create_project_homework: created the task
+ label_commit_limit: Expired but can submit your work
+
+ label_current_group: Current group
+
+ project_module_dts: DTS Test tool
+ label_module_share: DTS Test tool
+ field_dts_test: DTS Test tool
+
+ label_technical_support: Support ：
+ label_feedback: Feedback
+ #end
label_user: User
label_user_plural: Users
@@ -618,7 +682,7 @@ en:
label_home: Home
label_my_page: My page
label_my_account: My account
- label_my_message: My messages
+ label_my_message: Msgs
label_my_projects: My projects
label_my_page_block: My page block
label_administration: Administration
@@ -1249,6 +1313,7 @@ en:
#fq
button_leave_meassge: Submit
+ button_clear_meassge: Reset
label_leave_message_to: leave %{name} a message
label_leave_message: Message content
label_message: message board
@@ -1350,9 +1415,9 @@ en:
label_leave_others_message: leave message to him/her
label_leave_a_message: Leave him/her a message：
label_leave_your_message: Leave a message to you
- label_new_activities: ' has new activity in' # modified by bai
- label_new_activity: ' has new activity in'
- label_i_new_activity: ' have new activity in'
+ label_new_activities: ' has a new activity in' # modified by bai
+ label_new_activity: ' has a new activity in'
+ label_i_new_activity: ' have a new activity in'
label_create_project: had participated in
label_praise: praise
label_cancel_praise: cancel praise
@@ -1631,7 +1696,7 @@ en:
label_bids_form_contest_new_description: Enterprise or college can release a contest here.
label_contest_name: Input the name of the contest
label_contest_description: Content：description your contest
- label_main_teacher: Main teacher
+ label_main_teacher: Lecturer
label_main_term: Term
label_teacher_work_unit: Position
label_course_overview: Status
@@ -1698,7 +1763,7 @@ en:
label_reply_empty: Reply Cann't Empty.
label_setup_time: Start date
label_endup_time: Over date
- label_class_period: Class hour
+ label_class_period: Lessons
label_class_hour: period
label_activity_time: publish date
diff --git a/db/migrate/20150123020615_add_show_result.rb b/db/migrate/20150123020615_add_show_result.rb
new file mode 100644
index 000000000..0407abceb
--- /dev/null
+++ b/db/migrate/20150123020615_add_show_result.rb
@@ -0,0 +1,9 @@
+class AddShowResult < ActiveRecord::Migration
+ def up
+ add_column :polls, :show_result, :integer, default: 1
+ end
+
+ def down
+ remove_column :polls, :show_result
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d0d755bd3..20c74ba1e 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 => 20150121030451) do
+ActiveRecord::Schema.define(:version => 20150123020615) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -23,18 +23,6 @@ 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
@@ -844,9 +832,10 @@ ActiveRecord::Schema.define(:version => 20150121030451) do
t.integer "user_id"
t.datetime "published_at"
t.datetime "closed_at"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.text "polls_description"
+ t.integer "show_result", :default => 1
end
create_table "praise_tread_caches", :force => true do |t|