jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
xianbo 2013-11-05 15:40:51 +08:00
parent 83b30b1f9e d6aa6550d7
commit 82c597a163
7 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/layouts/base_bids.html.erb
View File

@ -34,11 +34,11 @@
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"">企业众包社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前位置 : </strong></td>
<td rowspan="2" width="350px">
<td style="width: 430px; color: #15bccf""><strong>当前位置 : </strong></td>
<td rowspan="2" width="250px">
<div class="project-search">
<%= form_tag(calls_path, :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'reward_type', params[:reward_type] %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>

6
app/views/layouts/base_contest.html.erb
View File

@ -27,11 +27,11 @@
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"">创新竞赛社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前位置 : </strong></td>
<td rowspan="2" width="350px">
<td style="width: 430px; color: #15bccf""><strong>当前位置 : </strong></td>
<td rowspan="2" width="250px">
<div class="project-search">
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'reward_type', @bid.reward_type %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>

6
app/views/layouts/base_courses.html.erb
View File

@ -29,11 +29,11 @@
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"">高校课程实践社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前单位 : <!-- <%= @course.teacher.user_extensions.occupation %> --></strong></td>
<td rowspan="2" width="350px">
<td style="width: 430px; color: #15bccf""><strong>当前位置 : <!-- <%= @course.teacher.user_extensions.occupation %> --></strong></td>
<td rowspan="2" width="250px">
<div class="top-content-search">
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'project_type', @project.project_type %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>

4
app/views/layouts/base_homework.html.erb
View File

@ -25,10 +25,8 @@
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"">高校课程实践社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前单位 : </strong></td>
<td rowspan="2" width="350px">
<td style="width: auto; color: #15bccf""><strong>当前位置 : </strong></td>
</td>
</tr>
<tr>
<td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td>

6
app/views/layouts/base_projects.html.erb
View File

@ -28,11 +28,11 @@
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"">软件项目托管社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前位置: </strong></td>
<td rowspan="2" width="350px">
<td style="width: 430px; color: #15bccf""><strong>当前位置: </strong></td>
<td rowspan="2" width="250px">
<div class="top-content-search">
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>

6
app/views/layouts/base_users.html.erb
View File

@ -27,11 +27,11 @@
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_user_home) %></td>
<td style="width: 350px; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
<td rowspan="2" width="350px">
<td style="width: 430px; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
<td rowspan="2" width="250px">
<div class="top-content-search">
<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
</div>

2
app/views/welcome/index.html.erb
View File

@ -1,5 +1,5 @@
<!--add by huang-->
<div style="height:280px;">
<div style="height:280px; padding-top: 10px">
<div class="welcone_left">
<table width="388px">
<tr>