From 04dffb2f89db0a02b865398982f86a3da357a628 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 7 Sep 2015 18:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=9B=9E=E7=AD=94=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 3 ++- app/views/users/_user_homework_list.html.erb | 2 +- .../users/new_user_commit_homework.html.erb | 5 +++-- public/images/CloseBtn.png | Bin 0 -> 3289 bytes public/images/course/icons.png | Bin 0 -> 5425 bytes public/javascripts/homework.js | 6 +++++- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 public/images/CloseBtn.png create mode 100644 public/images/course/icons.png diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 7be8811a4..1cfcf0782 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -1,5 +1,6 @@ <% content_for :header_tags do %> - <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> + <%= stylesheet_link_tag "/javascripts/poshytip-1.2/src/tip-yellow/tip-yellow.css" %> + <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> <%= javascript_include_tag 'homework','baiduTemplate' %> <% end %> diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index f0bab160f..1a24b1499 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -21,7 +21,7 @@ <% if homework_common.homework_type == 2 && is_teacher%>
- <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue' %> + <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
<% end %>
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index 8d5a1a48c..8182f754d 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -38,8 +38,9 @@ -
+
+
<%= @is_test ? '模拟答题' : '提交作品' %>
@@ -70,7 +71,7 @@ <%= f.text_area :name, id: 'program-title', class:"InputBox W700", placeholder:"请概括你的代码的功能" %>
- <%= f.text_area :description, id: 'program-src', class:" W700 H150", placeholder:"请贴入你的代码", rows: 10 %> + <%= f.text_area :description, id: 'program-src', class:"InputBox W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
测试代码 diff --git a/public/images/CloseBtn.png b/public/images/CloseBtn.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb06c5481ef4c90e3a8bd5f5a2bdc2e2c7683a3 GIT binary patch literal 3289 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 WXA=-%d-KAT0(!TNZdGbI#QX~wmN!KJ literal 0 HcmV?d00001 diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index e38a53197..a7743a52c 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -4,7 +4,7 @@ $(function(){ var bt=baidu.template; bt.LEFT_DELIMITER=''; - + var tested = false; var valid_form = function() { var src = $('#program-src').val(); @@ -95,6 +95,10 @@ $(function(){ //发布作业 + + $('#program-src').focus(function(){ + $(this).css('height', '100px'); + }); var isProgramHomework = function(){ return !$(".advanced_option").is(":hidden"); }