diff --git a/Gemfile.lock b/Gemfile.lock index 6916219a9..4ba8ecf6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,6 @@ GEM mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.10.1) - mysql2 (0.3.11) mysql2 (0.3.11-x86-mingw32) net-ldap (0.3.1) nokogiri (1.6.3) diff --git a/app/models/web_footer_company.rb b/app/models/web_footer_company.rb index 0743b6a9c..fa51a3a66 100644 --- a/app/models/web_footer_company.rb +++ b/app/models/web_footer_company.rb @@ -3,6 +3,6 @@ class WebFooterCompany < ActiveRecord::Base validates :name, presence: true, length: { maximum: 500 } validates :url, length: { maximum: 500 }, format: { with: /(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?/, - message: l(:is_not_url_error) + message: :invalid } end diff --git a/app/views/contests/_history.html.erb b/app/views/contests/_history.html.erb index 75fffe734..1115b81b0 100644 --- a/app/views/contests/_history.html.erb +++ b/app/views/contests/_history.html.erb @@ -24,7 +24,7 @@ <% end %> <% if reply_allow %> <%= 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;"} %> + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> <%= link_to(l(:button_quote), contests_path(:id => contest, :journal_id => journal), :remote => true, diff --git a/app/views/contests/_new.html.erb b/app/views/contests/_new.html.erb index a72ff6f36..2a88a7f46 100644 --- a/app/views/contests/_new.html.erb +++ b/app/views/contests/_new.html.erb @@ -1,23 +1,8 @@ - - -<%= form_for('contest_message', - :remote => true, :method => :post, - :url => {:controller => 'contests', +
+ <%= form_for('contest_message', + :remote => true, :method => :post, + :url => {:controller => 'contests', :action => 'create', :id => contest, :sta => sta} @@ -28,52 +13,24 @@
<% if User.current.logged? %> - - - - - - -
<%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), - :style => "resize: none;", - :class => 'noline' + :style => "resize: none; width: 98%", + :class => 'noline', + :maxlength => 250 %> -
- <%= f.text_field :reference_user_id, :style=>"display:none"%> - - - - - - - - -
- <%= submit_tag l(:button_leave_meassge), - :name => nil , - :class => "contest_btn", - :onmouseout => "this.style.backgroundPosition = 'left top'", - :onmouseover => "this.style.backgroundPosition = 'left -31px'" - %> - <%= submit_tag l(:button_clear_meassge), - :name => nil, - :onclick => "clearMessage('contest_message_message');", - :type => 'button', :class => "bid_btn", - :onmouseout => "this.style.backgroundPosition = 'left top'", - :onmouseover => "this.style.backgroundPosition = 'left -31px'" - %> -
- + <%= f.text_field :reference_user_id, :style=>"display:none"%> + <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> <% else %>
<%= l(:label_user_login_tips) %> <%= link_to l(:label_user_login_new), signin_path %>
<% end %> -<% end %> + <% end %> +
+ \ No newline at end of file diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb index 7e107cb73..bbda34b88 100644 --- a/app/views/contests/show_contest.html.erb +++ b/app/views/contests/show_contest.html.erb @@ -4,5 +4,41 @@ <%= render :partial => 'contest_jours', :locals => { :contest => @contest, :journals => @jour, :state => false} %> + <% html_title(l(:label_user_response)) -%> diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 57bde9e68..e1efe4f58 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -17,13 +17,14 @@ <%= f.text_area 'course_message', :rows => 3, :cols => 65, :placeholder => "#{l(:label_welcome_my_respond)}", :style => "resize: none; width: 98%", - :class => 'noline'%> + :class => 'noline',:maxlength => 250%> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> <% end %> <% end %> - +
+
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index beb31f830..19b5cef0d 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -24,7 +24,7 @@ <% end %> <% if reply_allow %> <%= 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;"} %> + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> <% end %> diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb index cbc189ef5..5b2889b57 100644 --- a/app/views/homework_attach/_addjour.html.erb +++ b/app/views/homework_attach/_addjour.html.erb @@ -69,7 +69,9 @@ <% if User.current.logged? %> <%= f.text_area 'user_message', :rows => 3, :cols => 65, - :style => "resize: none;", :class => 'noline', :placeholder => l(:text_caracters_maximum,:count=>250)%> + :style => "resize: none;", :class => 'noline', :placeholder => l(:text_caracters_maximum,:count=>250), + :maxlength => 250 + %> <%= f.text_field :reference_user_id, :style=>"display:none"%>
<%= l(:label_submit_comments) %> diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb index c0b397483..bce3e4d03 100644 --- a/app/views/homework_attach/_show.html.erb +++ b/app/views/homework_attach/_show.html.erb @@ -1,6 +1,42 @@ <% reply_allow = JournalsForMessage.create_by_user? User.current %> + diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb index bc4d19225..70a1a5f27 100644 --- a/app/views/words/_new.html.erb +++ b/app/views/words/_new.html.erb @@ -35,50 +35,31 @@ border: #d5dee9 1px solid; } +
+ <%= form_for('new_form', :remote => true, :method => :post, + :url => {:controller => 'words', + :action => 'create', + :user_id => user.id, + :sta => sta}) do |f|%> - - -<%= form_for('new_form', :remote => true, :method => :post, -:url => {:controller => 'words', -:action => 'create', -:user_id => user.id, -:sta => sta}) do |f|%> +
+ <%= render :partial => 'words/pre_show', :locals => {:content => @content} %> +
-
- <%= render :partial => 'words/pre_show', :locals => {:content => @content} %> -
+ <% if User.current.logged? %> + <%= f.text_area 'user_message', :rows => 3, :cols => 65, + :placeholder => "#{l(:label_leave_a_message)}", + :style => "resize: none; width: 98%", + :class => 'noline',:maxlength => 250%> -<% if User.current.logged? %> - - - - -
<%= f.text_area 'user_message', :rows => 3, :cols => 65, :value => "#{l(:label_leave_a_message)}", :onfocus => "clearInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :onblur => "showInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :style => "resize: none;", :class => 'noline'%>
-<%= f.text_field :reference_user_id, :style=>"display:none"%> - - - - -
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%> - <%= submit_tag l(:button_cancel), :name => nil, :class => "enterprise", :onclick => "clearMessage('new_form_user_message');", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %>
-<% else %> -
- <%= l(:label_user_login_tips) %> - <%= link_to l(:label_user_login_new), signin_path %> -
-<% end %> -<% end %> + <%= f.text_field :reference_user_id, :style=>"display:none"%> + <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> + <% else %> +
+ <%= l(:label_user_login_tips) %> + <%= link_to l(:label_user_login_new), signin_path %> +
+ <% end %> +
+ <% end %> +
\ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 5e5045099..07e049d45 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -542,7 +542,7 @@ zh: label_url_prompt: 网址需以"http://"或"https://"开头，例：http://forge.trustie.net web_footer_company_create_fail: 合作单位创建失败 web_footer_company_update_fail: 合作单位更新失败 - is_not_url_error: 不是正确的url + is_not_url_error: 不是正确的网址 label_x_projects: zero: 无项目 one: 1 个项目 @@ -2194,4 +2194,4 @@ zh: label_anonymous: 匿名 label_submit_comments: 提交评论 field_evaluation_num: 匿评分配数量 - label_my_score: 我的评分 + label_my_score: 我的评分