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

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

This commit is contained in:
nwb 2014-07-19 10:59:30 +08:00
parent 6bced5106e 599a277af3
commit 60fa473608
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/contests/show_attendingcontest.html.erb
View File

@ -131,7 +131,7 @@
<tr style="width:800px;">
<span><%= l(:label_work_deposit_project) %>：</span>
<span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %></span>
<span><%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target => '_blank' %></span>
<span><%= link_to l(:label_create_new_projects),{:controller => 'projects',:action => 'new',course: 0, project_type: 0} , :target => '_blank',host:Setting.project_domain %></span><!-- new_project_path(course: 0, project_type: 0) -->
</tr>
<br/>
<br/>

4
app/views/courses/new.html.erb
View File

@ -1,3 +1,7 @@
<% @nav_dispaly_course_all_label = 1
@nav_dispaly_forum_label = 1
@nav_dispaly_course_label = nil
@nav_dispaly_store_all_label = 1 %>
<%= labelled_form_for @course do |f| %>
<h3><%=l(:label_course_new)%></h3>
<div class="box tabular">