p49726105
/
bigdir
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:
nieguanghui 2013-08-15 10:18:40 +08:00
parent 72801ec716 af10ae8306
commit 8b9793cace
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,6 @@
<ul> <ul>
</div> </div>
<% else %> <% else %>
<%= l(:label_no_user_respond_you) %> <p class="font_description"><%= l(:label_no_user_respond_you) %></p>
<% end %> <% end %>

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

@ -117,6 +117,6 @@
<ul> <ul>
</div> </div>
<% else %> <% else %>
<%= l(:label_user_activities) %> <p class="font_description"><%= l(:label_user_activities) %></p>
<% end %> <% end %>

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

@ -33,8 +33,9 @@
</ul> </ul>
<% else %> <% else %>
<% if @user != User.current %> <% if @user != User.current %>
<%= l(:label_project_un) %> <p class="font_description"><%= l(:label_project_un) %></p>
<% else %><%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%> <% else %>
<p class="font_description"><%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%></p>
<% end %> <% end %>
<% end %> <% end %>

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

@ -47,5 +47,5 @@
<ul> <ul>
</div> </div>
<% else %> <% else %>
<%= l(:label_follow_no_requirement) %> <p class="font_description"><%= l(:label_follow_no_requirement) %></p>
<% end %> <% end %>