项目资源库区分“项目内搜索”和“全站搜索”

app/views/files/_project_file_new.html.erb

@@ -41,7 +41,7 @@
     <div class="re_top">
       <%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search f_l",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "站内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "项目内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()", :style =>"width:72px;" %>
           <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
       <% end %>
       <% manage_allowed = User.current.allowed_to?(:manage_files, @project) %>

app/views/forums/show.html.erb

@@ -30,25 +30,13 @@
   <% end %>
 </div>
 <!--modified by huang-->
-<% #= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %>
 <span class="contextual-borad">
-	<%= link_to(
-                image_tag('edit.png')+l(:label_forum_edit),
-                {:action => 'edit', :id => @forum},
-                :method => 'get',
-                :title => l(:button_edit)
-        ) if @forum.editable_by?(User.current) %>
-  <%= link_to(
-              image_tag('delete.png')+'删除讨论区',
-              {:action => 'destroy', :id => @forum},
-              :method => :delete,
-              :data => {:confirm => l(:text_are_you_sure)},
-              :title => l(:button_delete)
+  <%= link_to(image_tag('edit.png')+l(:label_forum_edit),{:action => 'edit', :id => @forum},  :method => 'get', :title => l(:button_edit)) if @forum.editable_by?(User.current) %>
+  <%= link_to(image_tag('delete.png')+'删除讨论区', {:action => 'destroy', :id => @forum}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete)
       ) if @forum.destroyable_by?(User.current) %>
 </span>
 <span>
 	<%= link_to l(:label_memo_new_from_forum), new_forum_memo_path(@forum), :class => 'icon icon-add',
                 :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %>
 </span>
-
 <%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>

public/stylesheets/project.css

@@ -159,7 +159,7 @@ a:hover.c_dblue{ color: #0781b4;}
 .re_top input{ float:left;}
 .re_search{ margin-top:7px; margin-left:5px;}
 .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
-.re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px; }
+.re_schbtn{ width: 60px;height: 26px;color: #FFF;margin-right: 5px;margin-left: 0px;padding-left: 0px;border: medium none; }
 a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
 a:hover.re_fabu{background:#55a1b9;}
 .re_con{ margin:5px; width:665px;}