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 12:54:57 +08:00
parent b61f3ce79f 2a4539dc2c
commit 83b30b1f9e
8 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_base_header.html.erb
View File

@ -19,5 +19,5 @@
<!-- <%= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
<!-- <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -->
</div>
<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div>
<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 0px;margin-top: -10px;"></div>

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

@ -30,18 +30,18 @@
<div id="main" class="">
<!-- added by bai -->
<div class="top-bid-content">
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px">企业众包社区</td>
<td style="width: 350px"><strong>当前位置 : </strong></td>
<td class="info_font" style="width: 240px; color: #15bccf"">企业众包社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前位置 : </strong></td>
<td rowspan="2" width="350px">
<div class="project-search">
<%= form_tag(calls_path, :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= hidden_field_tag 'reward_type', params[:reward_type] %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "small", :name => nil %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
</div>
</td>

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

@ -23,18 +23,18 @@
<div id="main" class="">
<!-- added by bai -->
<div class="top-context-content">
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px">创新竞赛社区</td>
<td style="width: 350px"><strong>当前位置 : </strong></td>
<td class="info_font" style="width: 240px; color: #15bccf"">创新竞赛社区</td>
<td style="width: 350px; color: #15bccf""><strong>当前位置 : </strong></td>
<td rowspan="2" width="350px">
<div class="project-search">
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= hidden_field_tag 'reward_type', @bid.reward_type %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "small", :name => nil %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
</div>
</td>

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

@ -23,19 +23,19 @@
<%= render :partial => 'layouts/base_header'%>
<div id="main">
<!--added by huang-->
<div class="top-course-content">
<div class="top-content">
<% @project = Project.find_by_id(@project.id)%>
<% @course = Course.find_by_extra(@project.identifier)%>
<table>
<tr>
<td class="info_font" style="width: 240px">高校课程实践社区</td>
<td style="width: 350px"><strong>当前单位 : <!-- <%= @course.teacher.user_extensions.occupation %> --></strong></td>
<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">
<div class="top-content-search">
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= hidden_field_tag 'project_type', @project.project_type %>
<%= submit_tag l(:label_search), :class => "small", :name => nil %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
</div>
</td>

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

@ -24,8 +24,8 @@
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px">高校课程实践社区</td>
<td style="width: 350px"><strong>当前单位 : </strong></td>
<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>

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

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

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

@ -23,11 +23,11 @@
<%= render :partial => 'layouts/base_header'%>
<div id="main">
<!--added by huang-->
<div class="top-user-content">
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px"><%= l(:label_user_home) %></td>
<td style="width: 350px"><strong><%= l(:label_user_location) %> : </strong></td>
<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">
<div class="top-content-search">
<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
@ -39,7 +39,7 @@
</tr>
<tr>
<td style="padding-left: 8px"><a>http://forge.trustie.net</a></td>
<!-- modified by bai --> <td ><%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <span><%=link_to @user.show_name, user_path %></span></td>
<!-- modified by bai --> <td><%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <span><%=link_to @user.show_name, user_path %></span></td>
</tr>
</table>
</div>

4
public/stylesheets/application.css
View File

@ -12,11 +12,12 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/
/**/
.top-content{
background-color: rgb(214, 218, 242);
background-color: #f7f7f7;
height: 45px;
width: 940px;
line-height: 1em;
padding-top: 5px;
margin-bottom: 10px;
}
/*added by bai*/
@ -57,6 +58,7 @@ h4 {border-bottom: 1px dotted #bbb;}
.top-content-home{
background-color: rgb(226, 244, 255);
width: 25%;
padding-bottom :50px;
}