From e4edc5d1db85c13906772869e6ef34e07832c962 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 14 Jan 2015 10:05:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E5=AE=8C=E6=88=90=E5=90=8E=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E5=A4=B4=E9=A1=B5=E9=9D=A2=203.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=8C=89=E9=92=AE=E7=9A=84css=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll_form.html.erb | 59 +++++++++++++++++++++++++++++ app/views/poll/_show_head.html.erb | 8 ++++ app/views/poll/edit.html.erb | 13 +------ app/views/poll/index.html.erb | 5 +++ app/views/poll/new.html.erb | 60 +----------------------------- public/stylesheets/polls.css | 5 +++ 6 files changed, 79 insertions(+), 71 deletions(-) create mode 100644 app/views/poll/_poll_form.html.erb create mode 100644 app/views/poll/_show_head.html.erb diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb new file mode 100644 index 000000000..0387bb9c6 --- /dev/null +++ b/app/views/poll/_poll_form.html.erb @@ -0,0 +1,59 @@ + + + + + 问卷调查_问卷编辑 + <%= stylesheet_link_tag 'polls', :media => 'all' %> + + + + + +
+ +
+ +
+
+ + <%= render :partial => 'edit_head'%> + +
+
+ +
+ + <%= l(:label_memo_create)%> + +
+
+ +
+ + diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb new file mode 100644 index 000000000..f8a2d58f0 --- /dev/null +++ b/app/views/poll/_show_head.html.erb @@ -0,0 +1,8 @@ +
+

标题标题标题标题标题标题标题

+

描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述 + 描述描述描述描述描述描述描述描述描述描述描述描述 +

+ +
+
\ No newline at end of file diff --git a/app/views/poll/edit.html.erb b/app/views/poll/edit.html.erb index a35b1d2e7..d346d0699 100644 --- a/app/views/poll/edit.html.erb +++ b/app/views/poll/edit.html.erb @@ -1,13 +1,2 @@ - -<%= form_for(@poll) do |f|%> - <%= f.text_field :polls_name, :required => true, :name => "polls_name"%> - - <%= l(:label_button_ok) %> - -<% end%> +<%= render :partial => 'poll_form'%> diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index 150c13382..9d0bd5549 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -26,6 +26,11 @@ method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10") %> <% end%> +
  • + <% if @is_teacher%> + <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%> + <% end%> +
  • <%= format_time poll.created_at%>
    • diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb index 06ef2fae8..eddb3a590 100644 --- a/app/views/poll/new.html.erb +++ b/app/views/poll/new.html.erb @@ -1,59 +1 @@ - - - - - 问卷调查_问卷编辑 - <%= stylesheet_link_tag 'polls', :media => 'all' %> - - - - - -
    - -
    - -
    -
    - -<%= render :partial => 'edit_head'%> - -
    -
    - -
    - - <%= l(:label_memo_create)%> - -
    -
    - -
    - - +<%= render :partial => 'poll_form'%> \ No newline at end of file diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 428ade808..b13cb1da2 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -13,6 +13,11 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi #polls .fl{ float: left;} #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_content{ width:615px;} .polls_head{ width:677px; height:48px; background:#eaeaea;}