From acda8ca15cea6cf3dd79ae2d2e4cf584c3ba2803 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 27 Oct 2016 09:02:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=EF=BC=9B=E5=A4=9A=E9=80=89=E9=A2=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=89=E9=A1=B9=E4=B8=8A=E4=B8=8B=E9=99=90?= =?UTF-8?q?=EF=BC=9B=E6=95=B0=E5=AD=97=E9=9A=8F=E9=80=89=E9=A1=B9=E6=95=B0?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=8F=98=E5=8C=96js=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_new_MCQ.html.erb | 24 ++++++++++++ app/views/poll/_poll_content.html.erb | 53 +++++++++++++++++++------- app/views/poll/_poll_form.html.erb | 6 +++ app/views/poll/_show_MC.html.erb | 2 +- public/images/course/icons.png | Bin 5425 -> 4127 bytes public/stylesheets/css/courses.css | 15 ++++++++ 6 files changed, 86 insertions(+), 14 deletions(-) diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb index 472ddfaf1..285ee81c8 100644 --- a/app/views/poll/_new_MCQ.html.erb +++ b/app/views/poll/_new_MCQ.html.erb @@ -9,6 +9,18 @@
\ No newline at end of file + + + \ 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 8f6f53a23..edf3e25f1 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -474,6 +474,12 @@ function insert_MCQ(quest_type,quest_num,quest_id){ { doc.parent().remove(); } + + $(".poll-multiple-limit option").remove(); + var upperLimit = $(".new_answer").size(); + for(var i = 1; i <= upperLimit; i++){ + $(".poll-multiple-limit").append(""); + } } //其他选项 function add_other_answer(doc) diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb index f54b57e7b..3bdb85aa5 100644 --- a/app/views/poll/_show_MC.html.erb +++ b/app/views/poll/_show_MC.html.erb @@ -13,7 +13,7 @@
- +
<% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> diff --git a/public/images/course/icons.png b/public/images/course/icons.png index 3519404eaf9bb4ea6c83b081954c7fc3203e7278..b5d7536aecaafe323599893e8d5b068569dd54ca 100644 GIT binary patch literal 4127 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 literal 5425 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 WXA=-%d-KAT0(!TNZdGbI#QX~wmN!KJ diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 06bb4ae89..2601670a6 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -559,3 +559,18 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .new-question {width:324px; height:30px; color:#888; background-color:#fff; padding-left:5px; margin-left:46px; cursor:pointer;} .new-subjective {width:550px; height:30px; color:#888; background-color:#fff; padding-left:5px; margin-left:96px; cursor:pointer;} .questionnaire-input {height:30px; border:1px solid #cbcbcb; padding-left:5px;} + +/*20161026问卷调查增加toolbar*/ +.poll-container {width:718px; border:1px solid #ddd; margin-bottom:10px; background-color:#fff; position:relative; color:#767676; border:1px solid #ddd;} +.pool-tool-bar {width:50px; position:absolute; top:0; left:0; text-align:center;} +.poll-content {margin-left:50px; padding:10px; border-left:1px solid #ddd;} +.poll-up{ background:url(/images/course/icons.png) 0px -479px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;} +.poll-up:hover{background:url(/images/course/icons.png) -23px -479px no-repeat;} +.poll-down{ background:url(/images/course/icons.png) 0px -502px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;} +.poll-down:hover{background:url(/images/course/icons.png) -23px -502px no-repeat;} +.poll-add{ background:url(/images/course/icons.png) 2px -317px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;} +.poll-add:hover{background:url(/images/course/icons.png) -18px -317px no-repeat;} +.poll-delete{ background:url(/images/course/icons.png) 3px -343px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;} +.poll-delete:hover{ background:url(/images/course/icons.png) -17px -343px no-repeat;} +.poll-add-menu {border:1px solid #eaeaea; background:#fff; padding:5px 10px; width:60px; left:0; top:16px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display:none;} +.poll-multiple-limit {width:70px; outline: none;} \ No newline at end of file