jacknudt
/
socialforge
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 2014-01-24 15:43:53 +08:00
parent 72bdadd497 f96428ef20
commit 9d031819b8
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/projects/course.html.erb
View File

@ -11,7 +11,7 @@
<td rowspan="2">
<% if User.current.logged?%>
<% if User.current.user_extensions.identity == 0 %>
<%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
<%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => 1}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
<% end %>
<% end %>
</td>

4
public/stylesheets/nyan.css
View File

@ -14,6 +14,10 @@
.clear_both{
clear: both;
}
.memo-content pre{
white-space: normal;
word-wrap: break-word;
}
.highlight {
background-color: #fff34d;
-moz-border-radius: 3px;