From aeaa212c354be6abda24df8f3f5499933174dc48 Mon Sep 17 00:00:00 2001 From: z9hang Date: Sun, 2 Nov 2014 11:17:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=84=E5=88=86=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/_evaluation.html.erb | 2 +- app/views/homework_attach/_show.html.erb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/homework_attach/_evaluation.html.erb b/app/views/homework_attach/_evaluation.html.erb index c92f84e42..3d50bd6e3 100644 --- a/app/views/homework_attach/_evaluation.html.erb +++ b/app/views/homework_attach/_evaluation.html.erb @@ -1,4 +1,4 @@
评分: <%= rating_for homework, dimension: :quality, class: 'rateable div_inline' %> - + (您可以对作业进行多次评价，以最后一次评价为最终结果)
\ No newline at end of file diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb index 620a29936..c432d4f3f 100644 --- a/app/views/homework_attach/_show.html.erb +++ b/app/views/homework_attach/_show.html.erb @@ -8,6 +8,7 @@ //如果要做成点击后再转到请将
  • 中的onmouseover 改成 onclick; //]]> +<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>

    <%= @homework.name %>

    @@ -48,7 +49,7 @@

    - 评分: + <%= l(:label_work_rating) %>： <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
    From 4ce1ac9f945120ab0bb74d69f38d7bf51a4a0a81 Mon Sep 17 00:00:00 2001 From: z9hang Date: Sun, 2 Nov 2014 12:12:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/_history.erb | 4 +-- app/views/words/_journal_reply.html.erb | 2 +- app/views/words/_journal_reply_items.html.erb | 29 +++++++++---------- public/stylesheets/css.css | 4 ++- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb index f455d864d..6897ef6b5 100644 --- a/app/views/homework_attach/_history.erb +++ b/app/views/homework_attach/_history.erb @@ -39,11 +39,11 @@ :remote => true,:method => 'post', :title => l(:button_quote))%> <% end %> - + <%= l(:label_bids_published) %>  <%= time_tag(journal.created_on).html_safe %>  <%= l(:label_bids_published_ago) %> - +
    <% ids = 'project_respond_form_'+ journal.id.to_s%> diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index 5ddfe195c..51de1d539 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,6 +1,6 @@ <% id = "journal_reply_ul_" + journal.id.to_s%> -
    +
    <% fetch_user_leaveWord_reply(journal).each do |reply|%> <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %> <% end %> diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 656d5d912..3b018ddb5 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -1,16 +1,15 @@ <% reply_allow = JournalsForMessage.create_by_user? User.current %> <% ids_r = 'reply_respond_form_'+ reply.id.to_s %> -
    - - <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %> - -
    +
    +
    + <%= image_tag url_to_avatar(reply.user) %> +
    +
    <% id = 'project_respond_form_'+ reply.id.to_s %> -

    - - <%= link_to reply.user.name, user_path(reply.user) %> - :  - + <%= link_to reply.user.name, user_path(reply.user) %> + 回复 + <%= link_to reply.at_user.name,user_path(reply.at_user) %> +

    <%= reply.notes %> @@ -19,15 +18,15 @@ <%= format_time reply.created_on %> -

    diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 2a1ae81a7..e401b59da 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -91,8 +91,10 @@ a:hover.ping_sub{ background:#14a8b9;} .recall{ border-top:1px solid #CCC; padding:5px 0;} .recall_head{ float:left;} .recall_head a{ display:block; width:30px; height:30px; border:1px solid #CCC; padding:1px;} +.recall_head img{ height:30px; width:30px;} .recall_head a:hover{border:1px solid #15bccf;} -.recall_con{ float:left;color:#777777; width:335px; margin-left:10px; } +.recall_head img:hover{border:1px solid #15bccf;} +.recall_con{ float:left;color:#777777; width:90%; margin-left:10px; } .recall_con a{ color:#15bccf; } .ping_list{ margin-top:15px;}