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

Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 

Conflicts:
	app/views/files/_course_file.html.erb
	app/views/files/_project_file.html.erb
This commit is contained in:
huang 2016-08-26 16:27:14 +08:00
parent a71f948f41 3f7c623163
commit af68f4ca76
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/files/_course_file.html.erb
View File

@ -94,7 +94,7 @@
</p> </p>
</div> </div>
<% end %> <% end %>
<div class="resources mt10" style="padding-bottom:5px;"> <div class="resources mt10 pr" style="padding-bottom:5px;">
<div class="reTop mb5"> <div class="reTop mb5">
<%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %> <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
<%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%> <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
@ -124,6 +124,12 @@
</div> </div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="resource_tip_box fontGrey2">
<em></em>
<span></span>
<p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
<p>公共资源：<br/>对所有用户可见</p>
</div>
</div> </div>
<div id="course_list"> <div id="course_list">
<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %> <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>

8
app/views/files/_project_file.html.erb
View File

@ -65,7 +65,7 @@
</p> </p>
</div> </div>
<% end %> <% end %>
<div class="resources mt10" style="padding-bottom:5px;"> <div class="resources mt10 pr" style="padding-bottom:5px;">
<div class="reTop mb5"> <div class="reTop mb5">
<%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search",:remote=>true) do %> <%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search",:remote=>true) do %>
<%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%> <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
@ -102,6 +102,12 @@
</div> </div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="resource_tip_box fontGrey2">
<em></em>
<span></span>
<p class="mb5">私有资源：<br/>仅对本项目成员可见</p>
<p>公共资源：<br/>对所有用户可见</p>
</div>
</div> </div>
<div id="course_list"> <div id="course_list">
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %> <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>

7
public/stylesheets/css/public.css
View File

@ -1418,4 +1418,9 @@ a:hover.comment_ding_link{ color:#269ac9;}
} }
a.syllabusbox_a_blue{ a.syllabusbox_a_blue{
color:#3b94d6 !important; color:#3b94d6 !important;
} }
/*资源提示框*/
.resource_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-150px; top:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
.resource_tip_box em {display:block; border-width:10px; position:absolute;top:35px; left:-20px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;}
.resource_tip_box span {display:block; border-width:10px; position:absolute;top:35px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;}