修正了UTF-8问题;修正了上传头像显示问题
This commit is contained in:
parent
23be95649f
commit
1dd86b9116
|
@ -1006,7 +1006,7 @@ module ApplicationHelper
|
|||
html << "<div id='errorExplanation'><ul>\n"
|
||||
errors.each do |error|
|
||||
###by xianbo
|
||||
if(error!="#{l(:abel_repository_path_not_null)}")
|
||||
if(error!=l(:label_repository_path_not_null))
|
||||
html << "<li>#{h error}</li>\n"
|
||||
end
|
||||
###xianbo
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
<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| %>
|
||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||
<%= submit_tag l(:button_save) %>
|
||||
|
|
|
@ -29,8 +29,6 @@ border:none
|
|||
<% end %></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.select(:path_encoding, [nil] + Setting::ENCODINGS, :label => l(:field_scm_path_encoding))%>
|
||||
<%= l(:text_scm_path_encoding_note)%></p>
|
||||
</div>
|
||||
<p>
|
||||
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>
|
||||
|
|
Loading…
Reference in New Issue