From 4663751e7e32319c6b5054dd80e301397567ddad Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Tue, 13 Aug 2013 11:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/avatar/_avatar_form.html.erb | 2 +- app/views/projects/_form.html.erb | 1 + app/views/projects/new.html.erb | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index f7e8b0e2..fc55bd2e 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -35,7 +35,7 @@ filter: alpha(opacity:0); } -
+
<%= image_tag(url_to_avatar(source), id: "avatar_image", size: AvatarHelper::AVATAR_SIZE,:class=>"avatar")%>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index 135a56b7..ab27047c 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -1,5 +1,6 @@ <%= error_messages_for 'project' %> +

<%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %>

<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %>

<%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>

diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index c6652389..4f34d498 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -3,7 +3,6 @@ <%= labelled_form_for @project do |f| %>
-

<%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %>

<%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>