jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修正了UTF-8问题；修正了上传头像显示问题

This commit is contained in:
nieguanghui 2013-08-13 15:58:21 +08:00
parent 23be95649f
commit 1dd86b9116
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -1006,7 +1006,7 @@ module ApplicationHelper
html << "<div id='errorExplanation'><ul>\n" html << "<div id='errorExplanation'><ul>\n"
errors.each do |error| errors.each do |error|
###by xianbo ###by xianbo
if(error!="#{l(:abel_repository_path_not_null)}") if(error!=l(:label_repository_path_not_null))
html << "<li>#{h error}</li>\n" html << "<li>#{h error}</li>\n"
end end
###xianbo ###xianbo

1
app/views/projects/_edit.html.erb
View File

@ -1,5 +1,4 @@
<div class="box tabular" style="margin-right:10px;" > <div class="box tabular" style="margin-right:10px;" >
<div style="padding-left: 100px"><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></div>
<%= labelled_form_for @project do |f| %> <%= labelled_form_for @project do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>

2
app/views/repositories/_form_create.html.erb
View File

@ -29,8 +29,6 @@ border:none
<% end %></p> <% end %></p>
<!-- <p><%= f.text_field :url, :size => 60, :required => true,:readonly=>true, :class=>'textbg'%></p> --> <!-- <p><%= f.text_field :url, :size => 60, :required => true,:readonly=>true, :class=>'textbg'%></p> -->
<p><%= f.password_field :upassword, :required =>true, :label=> :field_password %></p> <p><%= f.password_field :upassword, :required =>true, :label=> :field_password %></p>
<p><%= f.select(:path_encoding, [nil] + Setting::ENCODINGS, :label => l(:field_scm_path_encoding))%>
<%= l(:text_scm_path_encoding_note)%></p>
</div> </div>
<p> <p>
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %> <%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>