Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/layouts/base_courses.html.erb

@@ -38,9 +38,8 @@
 									<% @course = Course.find_by_extra(@project.identifier)%>
 									<table>
 										<tr>
-											<td> <% if(@project.project_type==1)%>
-
-											<% if get_avatar?(@project)%>
+											<td><% if(@project.project_type==1) %>
+											<% if get_avatar?(@project) %>
 											<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2"), project_path(@project) %>
 											<% else %>
 											<%= link_to image_tag('../images/avatars/Project/course.jpg',  :class => "avatar2"), project_path(@project)%>

app/views/projects/_course_form.html.erb

@@ -5,7 +5,9 @@
 
 
 <!--[form:project]-->
-
+<% unless @project.new_record? %>
+<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
+<% end %>
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->