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

Merge branch 'szzh' into develop

This commit is contained in:
sw 2015-08-04 17:53:45 +08:00
parent 2e4babc2ae 08c4df8570
commit 34260626c9
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/layouts/_base_footer_public.html.erb
View File

@ -6,10 +6,12 @@
<li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
<li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
<li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
<li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a><select class="languageBox">
<option value="Chinese" selected="selected">中文</option>
<option value="English">英文</option>
</select></li>
<li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
<select class="languageBox">
<option value="Chinese" selected="selected">中文</option>
<option value="English">英文</option>
</select>
</li>
</ul>
</div>

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

@ -180,7 +180,7 @@
</div><!--Content end-->
<div class="cl"></div>
<%= render :partial => 'layouts/base_footer_public' %>
<%= render :partial => 'layouts/new_footer' %>
<div class="cl"></div>
</div><!--Container end-->
<%= render :partial => 'layouts/new_feedback' %>

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

@ -173,7 +173,7 @@
</div>
<div style="clear:both;"></div>
<div class="cl"></div>
<%= render :partial => 'layouts/base_footer_public'%>
<%= render :partial => 'layouts/new_footer'%>
<div class="cl"></div>
</div><!--Container end-->
<div id="light" class="white_content02">

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

@ -169,7 +169,7 @@
<div class="cl"></div>
<div class="leftbox">
<div class="leftbox mt10">
<ul class="leftbox_ul_left">
<% if @user.user_extensions && @user.user_extensions.identity == 0 %>
<% if(get_create_course_count(@user)) != 0 %>