Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
This commit is contained in:
commit
8b9793cace
|
@ -51,6 +51,6 @@
|
|||
<ul>
|
||||
</div>
|
||||
<% else %>
|
||||
<%= l(:label_no_user_respond_you) %>
|
||||
<p class="font_description"><%= l(:label_no_user_respond_you) %></p>
|
||||
<% end %>
|
||||
|
||||
|
|
|
@ -117,6 +117,6 @@
|
|||
<ul>
|
||||
</div>
|
||||
<% else %>
|
||||
<%= l(:label_user_activities) %>
|
||||
<p class="font_description"><%= l(:label_user_activities) %></p>
|
||||
|
||||
<% end %>
|
|
@ -33,8 +33,9 @@
|
|||
</ul>
|
||||
<% else %>
|
||||
<% if @user != User.current %>
|
||||
<%= l(:label_project_un) %>
|
||||
<% else %><%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%>
|
||||
<p class="font_description"><%= l(:label_project_un) %></p>
|
||||
<% else %>
|
||||
<p class="font_description"><%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%></p>
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
|
|
|
@ -47,5 +47,5 @@
|
|||
<ul>
|
||||
</div>
|
||||
<% else %>
|
||||
<%= l(:label_follow_no_requirement) %>
|
||||
<p class="font_description"><%= l(:label_follow_no_requirement) %></p>
|
||||
<% end %>
|
||||
|
|
Loading…
Reference in New Issue