diff --git a/app/views/bids/_alert_anonyoms.html.erb b/app/views/bids/_alert_anonyoms.html.erb index f0bec4d30..0361c01b7 100644 --- a/app/views/bids/_alert_anonyoms.html.erb +++ b/app/views/bids/_alert_anonyoms.html.erb @@ -66,10 +66,10 @@

<% end %>
- + 确  定 - + 取  消
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 6b3f91587..25c6f6c7a 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -91,7 +91,7 @@ <% when 1 %> <%= link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %> <% when 2 %> - 匿评结束 + 匿评结束 <% end %> <%end%> diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index e107e50b3..05bec9874 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -38,7 +38,7 @@ $('#ajax-modal').css('height','240px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + - ""); + ""); $('#ajax-modal').parent().css("top","").css("left","").css("width","511"); $('#ajax-modal').parent().addClass("alert_praise"); <% end %> diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb index a305ccfec..733961a17 100644 --- a/app/views/bids/_new.html.erb +++ b/app/views/bids/_new.html.erb @@ -41,7 +41,7 @@ <%= f.text_field :reference_user_id, :style=>"display:none"%> <%= l(:button_clear_meassge) %> - <%= l(:label_responses) %> + <%= l(:label_responses) %> diff --git a/app/views/bids/alert_anonymous_comment.js.erb b/app/views/bids/alert_anonymous_comment.js.erb index 2ec98fcc2..5cb4018a6 100644 --- a/app/views/bids/alert_anonymous_comment.js.erb +++ b/app/views/bids/alert_anonymous_comment.js.erb @@ -3,6 +3,6 @@ showModal('ajax-modal', '500px'); $('#ajax-modal').css('height','180px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + - ""); + ""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("anonymos"); \ No newline at end of file diff --git a/app/views/bids/stop_anonymous_comment.js.erb b/app/views/bids/stop_anonymous_comment.js.erb index 82847a8f5..cf2096d3b 100644 --- a/app/views/bids/stop_anonymous_comment.js.erb +++ b/app/views/bids/stop_anonymous_comment.js.erb @@ -1,2 +1,2 @@ alert('关闭成功'); -$("#<%= @bid.id %>_anonymous_comment").html('匿评结束'); +$("#<%= @bid.id %>_anonymous_comment").html('匿评结束'); diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 23c74ed4b..50e943eaa 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -21,7 +21,7 @@ :style => "resize: none; width: 98%", :class => 'noline',:maxlength => 250%> - <%= l(:button_leave_meassge)%> + <%= l(:button_leave_meassge)%> <% end %> diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index 343e7252a..788f47d2d 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -68,10 +68,10 @@
  • - + <%= l(:label_new_join) %> - + <%= l(:button_cancel)%>
  • diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index 11bfd9f81..9112a945d 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -33,7 +33,7 @@ <% end %>
  • - 加入时间 + 加入时间
  • <% else %>
  • @@ -41,7 +41,7 @@
  • - 加入时间 + 加入时间
  • <% end %> @@ -51,7 +51,7 @@
    - + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40)) %>

    - + <%= l(:button_add) %>

    diff --git a/app/views/homework_attach/_praise_alert.html.erb b/app/views/homework_attach/_praise_alert.html.erb index d7f5dd446..3d9d05d79 100644 --- a/app/views/homework_attach/_praise_alert.html.erb +++ b/app/views/homework_attach/_praise_alert.html.erb @@ -11,8 +11,8 @@

    匿名评价

        据说雷锋做完好事是从来不留名的呢,我们这次评分也不留名!!!但是,但是,您给的分数一定要公正哦,老天爷看不到,我们的系统可是清楚得很!

        别怪我没告诉你,系统分配给你的作品不评价可是要扣分的哈!

    - 匿名评分 - 冒着扣分的危险残忍拒绝 + 匿名评分 + 冒着扣分的危险残忍拒绝 diff --git a/app/views/homework_attach/_show_star.html.erb b/app/views/homework_attach/_show_star.html.erb index 33279c360..80f9d7f54 100644 --- a/app/views/homework_attach/_show_star.html.erb +++ b/app/views/homework_attach/_show_star.html.erb @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/app/views/homework_attach/_show_static_star.html.erb b/app/views/homework_attach/_show_static_star.html.erb index 7fe3edf22..b0f525680 100644 --- a/app/views/homework_attach/_show_static_star.html.erb +++ b/app/views/homework_attach/_show_static_star.html.erb @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb index 26d2a02a0..91b59d4f2 100644 --- a/app/views/homework_attach/edit.html.erb +++ b/app/views/homework_attach/edit.html.erb @@ -107,7 +107,7 @@                        - + <%= l(:label_button_ok) %> 取  消 diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index e9d32afd4..7f677cf30 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -103,7 +103,7 @@                        - + <%= l(:label_button_ok) %> 取  消 diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index ab70ca8b6..8ee4f323b 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -184,9 +184,7 @@ <%= render :partial => 'layouts/new_feedback' %> <%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb index eda641ba7..3c4426696 100644 --- a/app/views/poll/_poll.html.erb +++ b/app/views/poll/_poll.html.erb @@ -16,9 +16,9 @@ <% end%> <% if poll.polls_status == 1 %> -
  • 发布问卷
  • +
  • 发布问卷
  • <% elsif poll.polls_status == 2%> -
  • 取消发布
  • +
  • 取消发布
  • <% else%>
  • 发布问卷
  • <% end%> diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index e4f61e074..319edc187 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -85,7 +85,7 @@ function edit_head(){ $('#ajax-modal').css('height','120px'); $('#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 fc6401615..4a1b2256d 100644 --- a/app/views/poll/_show_head.html.erb +++ b/app/views/poll/_show_head.html.erb @@ -1,5 +1,5 @@
    - +

    <%= poll.polls_name%>

    <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
    diff --git a/app/views/poll/commit_poll.js.erb b/app/views/poll/commit_poll.js.erb index f7a1b56fe..e1135eac8 100644 --- a/app/views/poll/commit_poll.js.erb +++ b/app/views/poll/commit_poll.js.erb @@ -3,7 +3,7 @@ showModal('ajax-modal', '400px'); $('#ajax-modal').css('height','100px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + - ""); + ""); $('#ajax-modal').parent().removeClass("alert_praise"); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("alert_box"); \ No newline at end of file diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb index cea582360..bede915b4 100644 --- a/app/views/poll/index.html.erb +++ b/app/views/poll/index.html.erb @@ -50,7 +50,7 @@ $('#ajax-modal').css('height','120px'); $('#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"); @@ -75,7 +75,7 @@ $('#ajax-modal').css('height','120px'); $('#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/publish_poll.js.erb b/app/views/poll/publish_poll.js.erb index 2e8dab181..b46895d79 100644 --- a/app/views/poll/publish_poll.js.erb +++ b/app/views/poll/publish_poll.js.erb @@ -4,7 +4,7 @@ showModal('ajax-modal', '250px'); $('#ajax-modal').css('height','111px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + - ""); + ""); $('#ajax-modal').parent().removeClass("alert_praise"); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("poll_alert_form"); \ No newline at end of file diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb index f2fcee96a..48053600c 100644 --- a/app/views/poll/republish_poll.js.erb +++ b/app/views/poll/republish_poll.js.erb @@ -4,7 +4,7 @@ showModal('ajax-modal', '250px'); $('#ajax-modal').css('height','80px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + - ""); + ""); $('#ajax-modal').parent().removeClass("alert_praise"); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("poll_alert_form"); \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 730236d8e..9441cdc16 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -179,7 +179,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .msg_box a:hover{ background-color:#03a1b3; text-decoration:none;} /****评分弹框****/ -#popbox{width:488px;height:550px;position:absolute;z-index:100;left:50%;top:40%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; } +/*#popbox{width:488px;height:550px;position:absolute;z-index:100;left:50%;top:40%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }*/ .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;} .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px; } .ping_con{ margin:5px; border-bottom:1px dashed #CCC; padding-bottom:5px;} @@ -276,7 +276,7 @@ a:hover.member_btn{ background:#329cbd;} .pro_new ul li{ margin-bottom:5px; width:auto; padding:2px 5px;} /* 匿名评分弹框 */ -#popbox02{width:480px;height:200px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} +/*.popbox02{width:480px;height:200px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;}*/ .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;} .ni_con { width:425px; margin:25px 30px;} .ni_con h2{ display:block; height:40px; width:188px; margin:0 auto;} diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index e07c10438..ea6456e3d 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -20,10 +20,7 @@ a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;} .polls_date{ color:#666666;margin-top:3px; } .polls_de{ color:#6883b6; margin-top:3px;} /****翻页***/ -.wlist{} -.wlist a{ float:right; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;} -.wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;} -.wlist_select a { background-color:#48aac9; color:#fff;} +.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px; border:1px solid #64bdd9;} /*问卷页面*/ .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;} @@ -109,11 +106,11 @@ a:hover.ur_icon_de{ background:url(images/icons.png) -20px -338px no-repeat;} a:hover.ur_icon_edit{ background:url(images/icons.png) -21px -272px no-repeat;} /***弹框***/ -#popbox_polls{width:300px;position:absolute;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} -.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-310px;background:url(../images/close.png) no-repeat;cursor:pointer;} +.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} +.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-310px;background:url(../images/bid/close.png) no-repeat;cursor:pointer;} .upload_box{ width:270px; margin:15px auto;} .polls_box_p{ font-size:14px; text-align:center;} -a.upload_btn{ display:block; float:left; margin:15px 0 5px; width:60px; height:30px; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:10px;} +a.upload_btn{ display:block; float:left; margin:15px 0 5px; width:60px; padding: 3px 0 4px 0; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:10px;} a:hover.upload_btn{ background:#06a9bc;} a.upload_btn_grey{background:#a3a3a3;} a:hover.upload_btn_grey{background:#8a8a8a;} @@ -145,6 +142,10 @@ a:hover.btn_pu{ background:#3cb761;} /*问卷提交时弹出框*/ .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:55%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .commit{height: 28px;display: block;width: 80px;color: #fff !important;background: #15bccf;text-align: center;padding-top: 4px;margin-left: 130px;margin-top: 4px;margin-right: 10px;} - +/******确定弹框***********/ +.poll_alert_form{width:140px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} +.polls_alert_btn_box{width: 100%;margin: 0 auto;padding-left: 45px;} +.polls_alert_upload_box{ width:120px; margin:15px auto;} +.polls_alert_box_p{ font-size:14px; padding-left: 45px;padding-top: 10px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 7f2641b42..cae60df38 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -214,6 +214,41 @@ html>body #ajax-indicator { position: fixed; } padding-left: 26px; vertical-align: bottom; } + +div.modal { + border-radius: 5px; + background: #fff; + z-index: 50; + padding: 4px; +} +.ui-widget-content { + border: 1px solid #ddd; + color: #333; +} +.ui-widget { + font-family: Verdana, sans-serif; + font-size: 1.1em; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; + zoom: 1; +} +.ui-widget-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-widget-overlay { + background: #666 url(http://forge.trustie.net/stylesheets/jquery/images/xui-bg_diagonals-thick_20_666666_40x40.png.pagespeed.ic.9mfuw_R0z1.png) 50% 50% repeat; + opacity: .5; + filter: Alpha(Opacity=50); +} /***** end Ajax indicator ******/ /***** Flash & error messages ****/