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:
z9hang 2014-05-15 10:50:57 +08:00
parent c48b850cf7 aa89900813
commit fb9d6f74af
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@
alert('error'); alert('error');
}); });
} else if (textStatus == 'error') { } else if (textStatus == 'error') {
alert('error'); alert('An error has occurred');
} }
}); });
} }

2
app/views/users/user_projects.html.erb
View File

@ -1,6 +1,6 @@
<!--add by huang--> <!--add by huang-->
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => 0}, :class => 'icon icon-add') if(User.current.allowed_to?(:add_project, nil, :global => true) && @user == User.current)%> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => 0}, :class => 'icon icon-add') if(User.current.allowed_to?(:add_project, nil, :global => true) && @user == User.current)%>
<span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span> <!--span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span-->
<%= watch_projects @state %> <%= watch_projects @state %>
<% unless @memberships.empty? %> <% unless @memberships.empty? %>
<div class="content_frame"> <div class="content_frame">

2
app/views/users/watch_projects.html.erb
View File

@ -1,5 +1,5 @@
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => 0}, :class => 'icon icon-add') if(User.current.allowed_to?(:add_project, nil, :global => true) && @user == User.current)%> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => 0}, :class => 'icon icon-add') if(User.current.allowed_to?(:add_project, nil, :global => true) && @user == User.current)%>
<span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span> <!--span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span-->
<%= watch_projects @state%> <%= watch_projects @state%>
<% if @watch_projects.count > 0 %> <% if @watch_projects.count > 0 %>
<% for watch_project in @watch_projects %> <% for watch_project in @watch_projects %>