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

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 

Conflicts:
	public/stylesheets/public.css
This commit is contained in:
whimlex 2015-04-22 10:18:49 +08:00
parent 5123ca1047 ee4cfb9c89
commit 0f037e78fa
25 changed files with 536 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/courses_controller.rb
View File

@ -191,8 +191,9 @@ class CoursesController < ApplicationController
results = searchmember_by_name(student_homework_score(@group.id,0,0,"desc"), q)
end
@is_remote = true
@result_count = results.count
@results = paginateHelper results, 10
#@result_count = results.count
#@results = paginateHelper results, 10
@results = results
@search_name = q
end
@ -315,13 +316,15 @@ class CoursesController < ApplicationController
when '1'
@subPage_title = l :label_teacher_list
@all_members = searchTeacherAndAssistant(@course)
@members = paginateHelper @all_members, 10
#@members = paginateHelper @all_members, 10
@members = @all_members
when '2'
@subPage_title = l :label_student_list
page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
@all_members = student_homework_score(0,page, 10,"desc")
# @all_members = @course.members
@members = paginateHelper_for_members @all_members, 10
# @members = paginateHelper_for_members @all_members, 10
@members = @all_members
end
respond_to do |format|
if params[:page]
@ -877,7 +880,7 @@ class CoursesController < ApplicationController
students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
)
GROUP BY members.user_id ORDER BY score #{score_sort_by} limit #{start_from}, #{nums}"
GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
end
else

15
app/helpers/projects_helper.rb
View File

@ -392,4 +392,19 @@ module ProjectsHelper
type
end
#显示项目配置菜单
def show_project_memu user
if user.allowed_to?(:edit_project, @project)
result = "edit_project"
elsif user.allowed_to?(:select_project_modules, @project)
result = "select_project_modules"
elsif user.allowed_to?(:manage_members, @project)
result = "manage_members"
elsif user.allowed_to?(:manage_versions, @project)
result = "manage_versions"
elsif user.allowed_to?(:manage_repository, @project)
result = "manage_repository"
end
result
end
end

1
app/views/avatar/_avatar_form.html.erb
View File

@ -47,6 +47,7 @@
<a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
<span><%= l(:button_upload_photo) %></span>
</a>
<span class="c_orange ml25 f12">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
<!-- :accept => 'image/png,image/gif,image/jpeg', -->
<span class="add_avatar" style="margin-left: -55px;width: 70px">
<%= file_field_tag 'avatar[image]',

3
app/views/avatar/_new_avatar_form.html.erb
View File

@ -2,7 +2,8 @@
<%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
</a>
<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
<a href="javascript:void(0)" class="upbtn fl">上传图片</a>
<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
<span class="c_orange ml25 mt43 f12 fl ">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
<%= file_field_tag 'avatar[image]',
:id => nil,
:class => 'upload_file ',

12
app/views/bids/_alert_anonyoms.html.erb
View File

@ -39,28 +39,28 @@
<% if @bid.comment_status == 0%>
<h2>开启匿评功能</h2>
<p>
开启匿评后学生将不能对作业进行
开启匿评后学生将不能对作品进行
<span class="c_blue">修改、删除</span>
等操作，目前有
<span class="c_pink"><%= totle_size%>个</span>
学生，共提交了
<span class="c_pink"><%= cur_size %></span>
份作业，占
份作品，占
<span class="c_pink"><%= percent %>%</span>，
是否确定开启匿评？
</p>
<% elsif @bid.comment_status == 1 %>
<h2>关闭匿评功能</h2>
<p>
关闭匿评后学生将不能对作业进行
关闭匿评后学生将不能对作品进行
<span class="c_blue">匿评</span>
,且作业列表将会
,且作品列表将会
<span class="c_blue">公开</span>，
目前分配了
<span class="c_pink"><%= totle_size%>份</span>
匿评作业，已评了
匿评作品，已评了
<span class="c_pink"><%= cur_size %></span>
份作业，占
份作品，占
<span class="c_pink"><%= percent %>%</span>，
是否确定关闭匿评？
</p>

2
app/views/bids/_bid_homework_show.html.erb
View File

@ -10,7 +10,7 @@
var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
$("#"+divname).html("<span style='color: #acaeb1;'>作业提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>"
$("#"+divname).html("<span style='color: #acaeb1;'>作品提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>"
+day1+"&nbsp;</span><span style='color: #acaeb1;'>天</span><span style='color: red;'>&nbsp;"
+hour+"&nbsp;</span><span style='color: #acaeb1;'>时</span><span style='color: red;'>&nbsp;"
+minute+"&nbsp;</span><span style='color: #acaeb1;'>分</span><span style='color: red;'>&nbsp;"

10
app/views/courses/_course.html.erb
View File

@ -79,16 +79,6 @@
</div>
</div>
<div class="add-info">
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
<%= get_course_term @course %>
</div>
<div class="add-info" style="margin-left: 30px; margin-top: -20px">
<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
</div>
<div class="tags">
<div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %>

13
app/views/courses/_course_members.html.erb
View File

@ -1,15 +1,4 @@
<div class="search_course fl">
<%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
<!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
<%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
<a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
<%= l(:label_search)%>
</a>
<br />
<span id="course_member_name_span" style="float: left"></span>
<% end %>
</div>
<div class="cl"></div>
<div class="members_left">
<ul style=" border-bottom:none;">
<li>

6
app/views/courses/_new_member_list.html.erb
View File

@ -70,9 +70,9 @@
<% end; reset_cycle %>
</div>
<ul class="wlist">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
</ul>
<!--<ul class="wlist">
<% #= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
</ul>-->
<% else%>
<p class="nodata">
<%= l(:label_no_data) %>

2
app/views/courses/search_member.js.erb
View File

@ -1 +1 @@
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
$('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');

14
app/views/courses/settings.html.erb
View File

@ -72,7 +72,21 @@
</div>
<div class="hwork_undis" id="tbc_02">
<div class="search_course fl">
<%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
<!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
<%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
<a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
<%= l(:label_search)%>
</a>
<br />
<span id="course_member_name_span" style="float: left"></span>
<% end %>
</div>
<div class="cl"></div>
<div id="course_members_setting">
<%= render :partial => "course_members" %>
</div>
</div><!---成员结束-->
</div><!--talknew end-->
<div class="cl"></div>

2
app/views/homework_attach/_homeworks_list.html.erb
View File

@ -47,7 +47,7 @@
<%= link_to User.current.login, user_path(User.current), :title => User.current.login%>
</span>
</li>
<li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作品，请创建作品</li>
<li class="c_red" style="margin:25px 0 0 20px;"> 您还没提交作品，请点击提交作品按钮：）</li>
<li class="wping">
<%= link_to "提交作品", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
</li>

4
app/views/layouts/base_projects.html.erb
View File

@ -122,12 +122,12 @@
<div class="cl"></div>
<div>
<a class="pr_info_name fl c_dark fb break_word" href="javascript:void(0)" target="_blank" >
<%= l(:label_project_name) %><%= @project.name %></a>
<%= l(:label_project_name) %><%= @project.name %>
<% if @project.is_public? %>
<span class="img_private"><%= l(:label_public)%></span>
<% else %>
<span class="img_private"><%= l(:label_private)%></span>
<% end %>
<% end %></a>
</div>
<div class="cl"></div>
<div>

2
app/views/members/create.js.erb
View File

@ -10,7 +10,7 @@
<% if @create_member_error_messages%>
alert("<%= @create_member_error_messages%>");
<% else%>
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
$('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
alert("添加成功");
<% end%>
hideOnLoad();

2
app/views/members/destroy.js.erb
View File

@ -2,6 +2,6 @@
$('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
// $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>');
<%elsif @course%>
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
$('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
<%end%>
hideOnLoad();

2
app/views/members/update.js.erb
View File

@ -1,7 +1,7 @@
<%if @project%>
$('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
<%elsif @course%>
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
$('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
<%end%>
hideOnLoad();

42
app/views/projects/settings.html.erb
View File

@ -20,15 +20,27 @@
<h2 class="project_h2">配置</h2>
</div>
<!--通过admin界面配置，不同角色显示不同的模块-->
<div class=" pro_setting">
<div id="pro_st_tb_" class="pro_st_tb_">
<ul>
<li id="pro_st_tb_1" class="pro_st_hovertab" onclick="project_setting(1);">信息</li>
<li id="pro_st_tb_2" class="pro_st_normaltab" onclick="project_setting(2);">模块</li>
<li id="pro_st_tb_3" class="pro_st_normaltab" onclick="project_setting(3);">成员</li>
<li id="pro_st_tb_4" class="pro_st_normaltab" onclick="project_setting(4);">版本</li>
<% show_memu = show_project_memu User.current%>
<% if User.current.allowed_to?(:edit_project, @project) %>
<li id="pro_st_tb_1" class="<%= show_memu == 'edit_project' ? 'pro_st_hovertab' : 'pro_st_normaltab'%>" onclick="project_setting(1);">信息</li>
<% end %>
<% if User.current.allowed_to?(:select_project_modules, @project) %>
<li id="pro_st_tb_2" class="<%= show_memu == 'select_project_modules' ? 'pro_st_hovertab' : 'pro_st_normaltab'%>" onclick="project_setting(2);">模块</li>
<% end %>
<% if User.current.allowed_to?(:manage_members, @project) %>
<li id="pro_st_tb_3" class="<%= show_memu == 'manage_members' ? 'pro_st_hovertab' : 'pro_st_normaltab'%>" onclick="project_setting(3);">成员</li>
<% end %>
<% if User.current.allowed_to?(:manage_versions, @project) %>
<li id="pro_st_tb_4" class="<%= show_memu == 'manage_versions' ? 'pro_st_hovertab' : 'pro_st_normaltab'%>" onclick="project_setting(4);">版本</li>
<% end %>
<!--<li id="pro_st_tb_5" class="pro_st_normaltab" onclick="project_setting(5);">问题类别</li>-->
<li id="pro_st_tb_6" class="pro_st_normaltab" onclick="project_setting(6);">版本库</li>
<% if User.current.allowed_to?(:manage_repository, @project) %>
<li id="pro_st_tb_6" class="<%= show_memu == 'manage_repository' ? 'pro_st_hovertab' : 'pro_st_normaltab'%>" onclick="project_setting(6);">版本库</li>
<% end %>
<!--<li id="pro_st_tb_7" class="pro_st_normaltab" onclick="project_setting(7);">活动（时间跟踪）</li>-->
<!--<li id="pro_st_tb_8" class="pro_st_normaltab" onclick="project_setting(8);">代码评审</li>-->
@ -37,28 +49,28 @@
<div class="cl"></div>
<div class="pro_st_ctt">
<div class="pro_st_dis" id="pro_st_tbc_01">
<%= render :partial=>"projects/settings/new_edit" %>
<div class="<%= show_memu == 'edit_project' ? 'pro_st_dis' : 'pro_st_undis'%>" id="pro_st_tbc_01">
<%= render :partial=>"projects/settings/new_edit" if User.current.allowed_to?(:edit_project, @project)%>
</div><!--tbc_01 end-->
<div class="pro_st_undis" id="pro_st_tbc_02">
<%= render :partial=>"projects/settings/new_modules" %>
<div class="<%= show_memu == 'select_project_modules' ? 'pro_st_dis' : 'pro_st_undis'%>" id="pro_st_tbc_02">
<%= render :partial=>"projects/settings/new_modules" if User.current.allowed_to?(:select_project_modules, @project)%>
</div><!--tbc_02 end-->
<div class="pro_st_undis" id="pro_st_tbc_03">
<%= render :partial=>"projects/settings/new_members" %>
<div class="<%= show_memu == 'manage_members' ? 'pro_st_dis' : 'pro_st_undis'%>" id="pro_st_tbc_03">
<%= render :partial=>"projects/settings/new_members" if User.current.allowed_to?(:manage_members, @project)%>
</div><!--tbc_03 end-->
<div class="pro_st_undis" id="pro_st_tbc_04">
<%= render :partial=>"projects/settings/new_versions" %>
<div class="<%= show_memu == 'manage_versions' ? 'pro_st_dis' : 'pro_st_undis'%>" id="pro_st_tbc_04">
<%= render :partial=>"projects/settings/new_versions" if User.current.allowed_to?(:manage_versions, @project)%>
</div><!--tbc_04 end-->
<!--<div class="pro_st_undis" id="pro_st_tbc_05">-->
<!--<%#= render :partial=>"projects/settings/new_issue_categories" %>-->
<!--</div>&lt;!&ndash;tbc_05 end&ndash;&gt;-->
<div class="pro_st_undis" id="pro_st_tbc_06">
<%= render :partial=>"projects/settings/new_repositories" %>
<div class="<%= show_memu == 'manage_repository' ? 'pro_st_dis' : 'pro_st_undis'%>" id="pro_st_tbc_06">
<%= render :partial=>"projects/settings/new_repositories" if User.current.allowed_to?(:manage_repository, @project)%>
</div><!--tbc_06 end-->
<!--<div class="pro_st_undis" id="pro_st_tbc_07">-->

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

@ -101,6 +101,7 @@
<p class="font_description">
<%= textAreailizable act.notes %>
</p>
<div style="display: inline-block; float: right; margin-top: 0px">
<span>
<% puts 11111111111111 %>

4
app/views/versions/show.html.erb
View File

@ -31,7 +31,7 @@
<table>
<tr>
<th>
<%= l(:field_estimated_hours) %>
<p class="fl c_blue f14 fb"><%= l(:field_estimated_hours) %>：</p>
</th>
<td class="total-hours">
<%= html_hours(l_hours(@version.estimated_hours)) %>
@ -40,7 +40,7 @@
<% if User.current.allowed_to?(:view_time_entries, @project) %>
<tr>
<th>
<%= l(:label_spent_time) %>
<p class="fr c_blue f14 fb"><%= l(:label_spent_time) %>：</p>
</th>
<td class="total-hours">
<%= html_hours(l_hours(@version.spent_hours)) %>

2
config/locales/users/zh.yml
View File

@ -118,7 +118,7 @@ zh:
label_goto: "前往»"
label_activity_project: "项目："
label_activity_project: 项目
label_active_call: 需求
label_active_homework: 作业
# 评论在commons模块下

38
config/locales/zh.yml
View File

@ -20,7 +20,7 @@ zh:
notice_file_not_found: 您访问的页面不存在或已被删除。
notice_locking_conflict: 数据已被另一位用户更新
notice_not_authorized: 对不起，您无权访问此页面。
notice_has_homework: 您已经提交过一份作业
notice_has_homework: 您已经提交过一份作品
notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。
notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。
notice_not_authorized_archived_project: 要访问的项目已经归档。
@ -312,13 +312,13 @@ zh:
permission_view_course_messages: 查看留言
permission_view_real_name: 查看真名
permission_view_students: 查看成员
permission_export_homeworks: 导出作业
permission_export_homeworks: 导出作品
permission_quote_project: 引用项目
permission_is_manager: 作为管理员
permission_as_teacher: 作为教师
permission_as_student: 作为学生
permission_paret_in_homework: 加入作业
permission_view_homework_attaches: 查看作业附件
permission_view_homework_attaches: 查看作品附件
permission_view_course_journals_for_messages: 查看课程留言
view_course_journals_for_messages: 课程留言
label_send_course_journals_for_messages: 发布了留言
@ -1138,7 +1138,7 @@ zh:
label_current_contributors: 位当前贡献者
label_commit_limit: 已截止，但可补交
label_commit_ar: 作业提交截止时间快到了！
lable_has_commit_homework: 您已提交过作业
lable_has_commit_homework: 您已提交过作品
#modify by men
label_x_current_contributors:
zero: 位当前贡献者
@ -1150,7 +1150,7 @@ zh:
label_users_on_trustie: 用户
label_front: 第一页
label_commit_on: 次提交
label_uncommit_homework: 暂无学生提交作业！
label_uncommit_homework: 暂无学生提交作品！
#modify by men
label_x_commit_on:
zero: 次提交
@ -1211,7 +1211,7 @@ zh:
label_student_response: 作业答疑 # modified by bai
label_bidding_project: 参与项目
label_homework_project: 已提交作业 #huang
label_homework_project: 已提交作品 #huang
button_bidding: 我要参加
field_enterprise: '企业：'
@ -1232,11 +1232,11 @@ zh:
label_wrong_date: 时间格式错误，请输入正确的时间 yyyy-mm-dd
label_bidding_succeed: 应标成功
label_bidding_contest_succeed: 竞赛提交成功 #added by bai
label_bidding_homework_succeed: 作业提交成功 #added by bai
label_bidding_homework_failed: 作业提交失败 #added by bai
label_bidding_homework_committed: 你已经提交过作业，不能重复提交！
label_bidding_homework_succeed: 作品提交成功 #added by bai
label_bidding_homework_failed: 作品提交失败 #added by bai
label_bidding_homework_committed: 你已经提交过作品，不能重复提交！
label_bidding_fail: 应标失败，该项目已经应标
label_bidding_homework_fail: 作业提交失败，该作业已经被提交！
label_bidding_homework_fail: 作品提交失败，该作品已经被提交！
label_requirement_list: 需求列表
@ -1246,9 +1246,9 @@ zh:
other: 应标项目
#end
label_x_homework_project: #modify by huang
zero: 已提交的作业
one: 已提交的作业
other: 已提交的作业
zero: 已提交的作品
one: 已提交的作品
other: 已提交的作品
#end
label_x_responses: #modify by men
zero: 留言
@ -1400,8 +1400,8 @@ zh:
label_bid_project: 项目
label_project_no_follow: 该项目暂未被关注！
label_no_bid_project: 暂无参与项目
label_no_course_project: 暂无已提交的作业！
label_course_submit_homework: 提交了作业
label_no_course_project: 暂无已提交的作品！
label_course_submit_homework: 提交了作品
label_bids_reward_method: 奖励方式 ：
label_bids_reward_what: 输入奖励内容
label_call_bonus: 奖金
@ -1432,7 +1432,7 @@ zh:
label_have_feedback: 有了
label_of_feedback: 的
label_welcome_participate: 参与了
label_cant_download: 未开启互评功能作业不允许下载
label_cant_download: 未开启互评功能作品不允许下载
lable_close_evaluation: 该作业未开启互评功能
lable_has_evaluation: 您已进行过评价
#modify by men
@ -1895,7 +1895,7 @@ zh:
label_max_length: 最多250个字
label_create_person: 创建人员
label_participation_person: 参与人员
label_homework_without_description: 该作业无任何描述！
label_homework_without_description: 该作品无任何描述！
label_sure_exit_homework: 是否确认退出该作业
label_teacher_comments: 教师评论
label_anonymous_comments: 匿评
@ -1968,9 +1968,9 @@ zh:
label_totle: 共有
label_homework_count: 个作业
lebel_homework_commit: 已提交的作业
lebel_homework_commit: 已提交的作品
label_open_anonymous_evaluation: 是否匿评
label_evaluation_description: 即每份作业被允许匿评的人数
label_evaluation_description: 即每份作品被允许匿评的人数
label_name_not_null: 名称不能为空
modal_valid_unpassing: 该分班已经存在

2
public/javascripts/course.js
View File

@ -357,7 +357,7 @@ function show_bid_dead_line(year,month,day,divname)
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
+ "</form>"
+ "<p class='fr'>作业提交还剩：</p>");
+ "<p class='fr'>作品提交还剩：</p>");
}
//验证新建作业的名字
function regex_bid_name()

4
public/stylesheets/application.css
View File

@ -30,9 +30,13 @@ ol,ul,li{ list-style-type:none}
a{ text-decoration:none; }
.ml10{ margin-left:10px;}
.ml20{ margin-left:20px;}
.ml25{ margin-left:25px;}
.ml30{ margin-left:30px;}
.mr10{ margin-right:10px;}
.mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;}
.f12{font-size:12px; font-weight:normal;}
.c_orange{color:#ff5722;}
.fl{ float: left;}
.fr{ float:right;}
.project_h4{ font-size:14px; color:#3b3b3b;}

2
public/stylesheets/pleft.css
View File

@ -24,7 +24,7 @@ a:hover.pr_join_a{ background:#41a8c8;}
.pr_info_score{ font-size:14px; color:#3e4040; }
.pr_info_score a{ color:#ff7143;}
.pr_info_score a:hover{ color:#64bdd9;}
.img_private{ background:url(../images/new_project/img_project.png) 0 0 no-repeat; width:33px; height:16px; color:#fff; font-size:12px; padding-left:7px; }
.img_private{ background:url(../images/new_project/img_project.png) 0 0 no-repeat; width:33px; height:16px; color:#fff; font-size:12px; padding-left:7px;white-space:nowrap;}
.info_foot_num{ color:#3ca5c6; }
.pr_info_foot{ color:#7f7f7f; margin-top:5px; }
.info_foot_num:hover{ color:#2390b2;}

2
public/stylesheets/public.css
View File

@ -56,6 +56,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.ml10{ margin-left:10px;}
.ml15{ margin-left:15px;}
.ml20{ margin-left:20px;}
.ml25{ margin-left:25px;}
.ml40{ margin-left:40px;}
.ml45{ margin-left:45px;}
.ml55{ margin-left:55px;}
@ -74,6 +75,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.mt8{ margin-top:8px;}
.mt10{ margin-top:10px;}
.mt13{ margin-top:13px;}
.mt43{ margin-top:43px;}
.mt40{ margin-top:40px;}
.mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;}