Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

app/controllers/courses_controller.rb

@@ -113,7 +113,8 @@ class CoursesController < ApplicationController
       courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
       @courses = paginateHelper courses,10
     end
-
+   @name = params[:name]
+   @type = 'courses'
     respond_to do |format|
       format.html {
         render :layout => 'course_base'

app/controllers/my_controller.rb

@@ -157,7 +157,7 @@ class MyController < ApplicationController
       File.delete(diskfile1) if File.exist?(diskfile1)
     end
 
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
 
   # Destroys user's account

app/controllers/projects_controller.rb

@@ -93,7 +93,8 @@ class ProjectsController < ApplicationController
 
     @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
     @project_pages = Paginator.new @project_count, @limit, params['page']
-
+    @name = params[:name]
+    @type = 'projects'
     respond_to do |format|
       format.html {
         render :layout => 'base'

app/controllers/users_controller.rb

@@ -454,6 +454,8 @@ class UsersController < ApplicationController
       end
       @users = scope.offset(@offset).limit(limit).all.reverse
     end
+    @name = params[:name]
+    @type = 'users'
     respond_to do |format|
       format.html {
         @groups = Group.all.sort

app/views/layouts/_logined_header.html.erb

@@ -17,24 +17,40 @@
       </li>
     </ul>
   </div>
-
+  <script>
+      <% type = type%>
+      $(document).ready(function (){
+          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+              $('input:radio[value="courses"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+              $('input:radio[value="projects"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+              $('input:radio[value="users"]').attr('checked','checked');
+          }
+      });
+  </script>
   <div class="fl" id="navHomepageSearch">
-    <form class="navHomepageSearchBox">
+    <!--<form class="navHomepageSearchBox">-->
-      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+    <% name = name%>
-      <a href="javascript:void(0);" class="homepageSearchIcon"></a>
-    </form>
 
+    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" />
+        <input type="hidden" name="search_type" id="type" value=""/>
+        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
+     <% end %>
     <div class="navSearchTypeBox" id="navHomepageSearchType">
       <div class="fl mr15 mt8">
-        <input type="radio" value="课程" name="navSearchType" checked/>
+        <input type="radio"  value="courses" name="search_type" checked/>
         课程
       </div>
       <div class="fl mr15 mt8">
-        <input type="radio" value="项目" name="navSearchType" />
+        <input type="radio"  value="projects" name="search_type" />
         项目
       </div>
       <div class="fl mr15 mt8">
-        <input type="radio" value="用户" name="navSearchType" />
+        <input type="radio" value="users" name="search_type"  />
         用户
       </div>
       <div id="navSearchAlert" class="fr mr10">

app/views/layouts/_unlogin_header.html.erb

@@ -18,11 +18,25 @@
        //  alert(3)
          $(doc).parent().submit();
      }
+     <% type = type%>
+     $(document).ready(function (){
+         if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+             $('input:radio[value="courses"]').attr('checked','checked');
+         }
+         if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+             $('input:radio[value="projects"]').attr('checked','checked');
+         }
+         if('<%= type %>' != null && '<%= type %>' == 'users' ){
+             $('input:radio[value="users"]').attr('checked','checked');
+         }
+     });
  </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
+    <% name = name%>
+
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" class="navHomepageSearchInput"/>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput"/>
       <input type="hidden" name="search_type" id="type" value=""/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
     <% end %>

app/views/layouts/base.html.erb

@@ -24,9 +24,9 @@
 <div class="cl"></div>
 <div class="navContainer mb10">
   <% if User.current.logged? %>
-      <%= render :partial => 'layouts/logined_header' %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
   <% else%>
-      <%= render :partial => 'layouts/unlogin_header' %>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
   <% end%>
 </div>
 <div class="cl"></div>

app/views/layouts/course_base.html.erb

@@ -27,9 +27,9 @@
 <div class="cl"></div>
 <div class="navContainer mb10">
   <% if User.current.logged? %>
-      <%= render :partial => 'layouts/logined_header' %>
+      <%= render :partial => 'layouts/logined_header' ,:locals=>{:name=>@name,:type=>@type}%>
   <% else%>
-      <%= render :partial => 'layouts/unlogin_header' %>
+      <%= render :partial => 'layouts/unlogin_header' ,:locals=>{:name=>@name,:type=>@type}%>
   <% end%>
 </div>
 <div class="cl"></div>

app/views/layouts/new_base_user.html.erb

@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','users', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user"%>

app/views/layouts/users_base.html.erb

@@ -22,9 +22,9 @@
 <div class="cl"></div>
 <div class="navContainer mb10">
   <% if User.current.logged? %>
-      <%= render :partial => 'layouts/logined_header' %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
   <% else%>
-      <%= render :partial => 'layouts/unlogin_header' %>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
   <% end%>
 </div>
 <div class="cl"></div>