diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb index 7dd7492c0..80fa1781f 100644 --- a/app/views/bids/_new.html.erb +++ b/app/views/bids/_new.html.erb @@ -29,16 +29,16 @@ <% if @bid.reward_type ==3 %> - + <% else %> - + <% end %>
<%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_question), :style => "resize: none;", :class => 'noline'%><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_max_length), :style => "resize: none;", :class => 'noline'%><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), :style => "resize: none;", :class => 'noline'%><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_max_length), :style => "resize: none;", :class => 'noline'%>
<%= f.text_field :reference_user_id, :style=>"display:none"%> - - + +
diff --git a/app/views/bids/_pre_show.html.erb b/app/views/bids/_pre_show.html.erb index 887530cf0..c67d4b2b1 100644 --- a/app/views/bids/_pre_show.html.erb +++ b/app/views/bids/_pre_show.html.erb @@ -1,6 +1,6 @@ <% unless content.nil?%> -
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%> <%= submit_tag l(:button_clear_meassge), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %>
+
diff --git a/app/views/bids/create.js.erb b/app/views/bids/create.js.erb index ee58e8c47..c140d70dc 100644 --- a/app/views/bids/create.js.erb +++ b/app/views/bids/create.js.erb @@ -1,4 +1,4 @@ -$('#history').html('<%= escape_javascript(render(:partial => 'bids/history', :locals => {:bid => @bid, :journals => @jour, :state => true})) %>'); +$('#history').html('<%= escape_javascript(render(:partial => 'homework_attach/history', :locals => {:bid => @bid, :journals => @jour, :state => true})) %>'); $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>'); $('#bid_message_message').val(""); $('#bid_message_reference_user_id').val(""); diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb new file mode 100644 index 000000000..985427b08 --- /dev/null +++ b/app/views/homework_attach/_history.erb @@ -0,0 +1,65 @@ +<% reply_allow = JournalsForMessage.create_by_user? User.current %> +<% label = '' + case bid.reward_type + when 1 + label = l(:label_respond_requirement) + when 2 + label = l(:label_contest_requirement) + when 3 + label = l(:label_question_requirement) + else + end +%> +
+
+ <% if journals.size > 0 %> + <% for journal in journals %> +
+
<%= image_tag(url_to_avatar(journal.user)) %>
+
+
+ + <%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%>2014-10-24 +
+

<%= textilizable journal.notes%>

+
+
+ <% ids = 'project_respond_form_'+ journal.id.to_s%> + + <% if reply_allow %> + <%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, + :remote => true,:method => 'post', :title => l(:button_quote))%> + <%= link_to l(:label_bid_respond_quote),'', + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} %> + <% end %> + <% if @user==User.current|| User.current.admin? %> + <%= link_to(l(:label_bid_respond_delete), + {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', + :class => "delete", :title => l(:button_delete)) %> + <% 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%> + <% if reply_allow %> +
+ <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %> +
+ <% end %> +
+
+ <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %> +
+
+
+
+ <% end %> + <% end %> +
+
\ No newline at end of file diff --git a/app/views/homework_attach/_homework_jours.html.erb b/app/views/homework_attach/_homework_jours.html.erb index 0d4b666e2..7e1544e96 100644 --- a/app/views/homework_attach/_homework_jours.html.erb +++ b/app/views/homework_attach/_homework_jours.html.erb @@ -1,72 +1,13 @@ -
+

留言内容

- - 取  消留  言 + <%= render :partial => 'bids/new', :locals => {:bid => @bid, :sta => @state} %> + + + +
+
+ <%= render :partial => 'history',:locals => { :bid => @bid, :journals => @jour, :state => false} %>
-<% reply_allow = JournalsForMessage.create_by_user? User.current %> -<% label = '' - case bid.reward_type - when 1 - label = l(:label_respond_requirement) - when 2 - label = l(:label_contest_requirement) - when 3 - label = l(:label_question_requirement) - else - end -%> -<% if journals.size > 0 %> - -<% end %> -
\ No newline at end of file + + diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 04249b3bc..929c06846 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -205,9 +205,13 @@ <%= l(:label_course_organizers) %> :
<% else %> diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index d9b9b4587..5ddfe195c 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,7 +1,7 @@ <% id = "journal_reply_ul_" + journal.id.to_s%> - + diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 030a0cdcd..656d5d912 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -1,6 +1,6 @@ <% 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" %> @@ -37,4 +37,4 @@ <% end %>
    -
    • \ No newline at end of file + \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 7bd6b8184..6f4826766 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1843,4 +1843,5 @@ en: label_search_conditions_not_null: The search conditions can not be empty lable_school_list: List of schools button_delete_file: delete - label_attachment: attachment \ No newline at end of file + label_attachment: attachment + label_max_length: A maximum of 250 characters \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 96584e8ac..2872cde7a 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2178,3 +2178,4 @@ zh: label_homework_list: 作品列表 label_time: 时间 label_attachment: 附件 + label_max_length: 最多250个字 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d6a5e22cd..2cb87d87e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2520,14 +2520,6 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;} /***** Icons *****/ -#sidebar #attachment_ a { - background-position: 0% 50%; - background-repeat: no-repeat; - font-family: '微软雅黑'; /*modify by men*/ - padding-left: 20px !important; - padding-top: 2px !important; - padding-bottom: 3px !important; -} .icon { background-position: 0% 50%; background-repeat: no-repeat; @@ -2536,7 +2528,14 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} padding-top: 2px; padding-bottom: 3px; } - +#sidebar #attachemnt_.icon { + background-position: 0% 50%; + background-repeat: no-repeat; + font-family: '微软雅黑'; /*modify by men*/ + padding-left: 20px; + padding-top: 2px; + padding-bottom: 3px; +} .icon_enterprise { background-position: 0% 50%; background-repeat: no-repeat; diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index ff2c60886..07bcc89d1 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -60,7 +60,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } .dis ul li.wmine{ margin:12px 0 0 10px;} .dis ul li.wmine a{ color:#3d7ec2; text-align:center; width:50px; font-weight: bold;} -.msg_box{ width:693px; height:170px; border-bottom:1px dashed #CCC; padding-top:20px;} +.msg_box{ width:693px; border-bottom:1px dashed #CCC; padding-top:20px;} .msg_box h4{ margin-left:15px;border-style: none;} .msg_box textarea{width:660px;height:90px;padding:2px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 15px; color:#666; font-size:12px;} .msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; color:#fff; margin-right:10px; text-align:center; margin-top:5px; } @@ -99,6 +99,7 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_C{border-bottom:1px dashed #CCC; padding:5px;} .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;} +.ping_dispic img{ height:46px; width:46px;} .ping_discon{ float:left; width:384px; margin-left:15px;} .ping_distop span{ float:left;} .ping_distop p{ color:#5f5f5f;}
    <%= textilizable content %>
    - - <%= @course.school %> - + <% if @course.school %> + + <%= @course.school %> + + <% else%> + + <% end %>