diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index 5fe25eed..c29903d7 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="top-content">
-  <%= form_tag(courses_search_path, :method => :get) do %>
+  <%= form_tag(:controller => 'courses', :action => 'search', :method => :get) do %>
       <table width="940px">
         <tr>
           <td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_course_practice) %></td>
diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb
new file mode 100644
index 00000000..96f8c227
--- /dev/null
+++ b/app/views/courses/search.html.erb
@@ -0,0 +1,66 @@
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
+<% end %>
+<div class="top-content">
+	<%= form_tag(:controller => 'courses', :action => 'search', :method => :get) do %>
+      <table width="940px">
+        <tr>
+          <td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_course_practice) %></td>
+          <td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
+          <td rowspan="2">
+            <% if User.current.logged?%>
+                <% if User.current.user_extensions.identity == 0 %>
+                    <%= link_to(l(:label_course_new), {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_course, nil, :global => true) %></td>
+                <% end %>
+            <% end %>
+            </td>
+            <td rowspan="2" >
+              <div class="project-search" style="float: right">
+                <%= text_field_tag 'name', params[:name], :size => 30 %>
+                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+              </div>
+            </td>
+            </tr>
+        <tr>
+          <td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/courses", :controller => 'courses', :action => 'index'%> </a></td>
+          <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'courses', :action => 'index' %></td>
+        </tr>
+      </table>
+	<% end %>
+</div>	
+
+<% if @courses.size == 0 %>
+<%= render :partial => 'layouts/no_content'%>
+<% else %>
+<div id="courses-index">
+	<%= render_course_hierarchy(@courses)%>
+</div>
+<% end %>
+
+<div class="pagination">
+	<ul>
+		<%= pagination_links_full @course_pages %>
+	</ul>
+</div>
+
+<% if User.current.logged? %>
+<p style="text-align:right;">
+	<span class="my-project"><%= l(:label_my_projects) %></span>
+</p>
+<% end %>
+
+<% other_formats_links do |f| %>
+<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= form_tag({}, :method => :get) do %>
+<h3><%= l(:label_project_plural) %></h3>
+<label for="closed"><%= check_box_tag 'closed', 1, params[:closed] %> <%= l(:label_show_closed_projects) %></label>
+<p>
+	<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
+</p>
+<% end %>
+<% end %>
+
+<% html_title(l(:label_course_all)) -%>