diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 730546aa6..1fbe6acaa 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -957,16 +957,17 @@ class ProjectsController < ApplicationController end # end + before_filter :toggleCourse, only: [:finishcourse, :restartcourse] # TODO:#finishcourse and #restartcourse 没有设置权限，也就是说，任何人的调用都会关闭or重启课程。 # 最好通过用户与项目的权限解决这种事情。还没写 def finishcourse - course_prefs = Course.find_by_extra(@project.identifier) + #course_prefs = Course.find_by_extra(@project.identifier) # setup_time = Time.parse(course_prefs.setup_time) # end_time = Time.parse(course_prefs.endup_time) yesterday = Date.today.prev_day.to_time - course_prefs.endup_time = yesterday - @save_flag = course_prefs.save + @course_prefs.endup_time = yesterday + @save_flag = @course_prefs.save respond_to do |format| format.js @@ -974,11 +975,11 @@ class ProjectsController < ApplicationController end def restartcourse - course_prefs = Course.find_by_extra(@project.identifier) + #course_prefs = Course.find_by_extra(@project.identifier) day = Time.parse("3000-01-01") - course_prefs.endup_time = day - @save_flag = course_prefs.save + @course_prefs.endup_time = day + @save_flag = @course_prefs.save respond_to do |format| format.js { @@ -988,6 +989,13 @@ class ProjectsController < ApplicationController end private + def toggleCourse + @course_prefs = Course.find_by_extra(@project.identifier) + unless (@course_prefs.teacher == User.current || User.current.admin?) + render_403 + end + end + def select_project_layout project = Project.find_by_id(params[:id]) diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index 9cc940bdd..281f6216d 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -8,6 +8,30 @@ class SoftapplicationsController < ApplicationController def index @softapplications = Softapplication.all + #new added fenyefunction + @limit = 5 + @softapplication_count = @softapplications.count + @softapplication_pages = Paginator.new @softapplication_count, @limit, params['page'] + @offset ||= @softapplication_pages.offset + #@softapplications = @softapplications[@offset,@limit] + #new added end + + #new added sort + if params[:softapplication_sort_type].present? + case params[:softapplication_sort_type] + when '0' + @softapplications = @softapplications[@offset, @limit] + @s_state = 0 + when '1' + @softapplications = @softapplications.sort { |x, y| y[:created_at] <=> x[:created_at]}[@offset, @limit] + @s_state = 1 + end + else + @softapplications = @softapplications.sort { |x, y| y[:created_at] <=> x[:created_at]}[@offset, @limit] + @s_state = 1 + end + #new added end + respond_to do |format| format.html # index.html.erb format.json { render json: @softapplications } @@ -16,8 +40,25 @@ class SoftapplicationsController < ApplicationController # GET /softapplications/1 # GET /softapplications/1.json + + def percent_of(num, percent) + num.to_f / percent.to_f * 100.0 + end + def show @softapplication = Softapplication.find(params[:id]) + # 打分统计 + stars_reates = @softapplication. + rates(:quality) + stars_reates_count = stars_reates.count == 0 ? 1 : stars_reates.count + stars_status = stars_reates.select("stars, count(*) as scount"). + group("stars") + + @stars_status_map = Hash.new(0.0) + stars_status.each do |star_status| + @stars_status_map["star#{star_status.stars.to_i}".to_sym] = + percent_of(star_status.scount, stars_reates_count).to_s + "%" + end @jours = @softapplication.journals_for_messages.order('created_on DESC') @image_results = [] @softapplication.attachments.each do |f| diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 710b73194..c662c44f7 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -39,17 +39,18 @@ class WelcomeController < ApplicationController @courseCount = Project.course_entities.count @teacherCount = User.teacher.count @studentCount = User.student.count - @logoLink = logolink(params[:school_id]) + @logoLink = logolink() end - def logolink(id) + def logolink() + id = params[:school_id] logo_link = "" if id.nil? and User.current.user_extensions.school.nil? logo_link = '/images/transparent.png' else - if id.to_i == 0 + if id == "0" logo_link = '/images/transparent.png' else if id.nil? diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 8da5d7c35..23351d919 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -59,7 +59,13 @@ module IssuesHelper def issue_heading(issue) #h("#{issue.tracker} ##{issue.id}") - h("#{issue.tracker} #{issue.source_from}") + #h("#{issue.tracker} #{issue.source_from}") + s = '' + s << ">>" + s << link_to(@issue.project.name+l(:issue_list), project_issues_path(@issue.project)) + s << " >" + s << @issue.source_from + s.html_safe end def render_issue_subject_with_tree(issue) diff --git a/app/helpers/softapplications_helper.rb b/app/helpers/softapplications_helper.rb index e3cb6410d..fe78e9875 100644 --- a/app/helpers/softapplications_helper.rb +++ b/app/helpers/softapplications_helper.rb @@ -1,2 +1,18 @@ module SoftapplicationsHelper + def sort_softapplication(state) + content = ''.html_safe + case state + when 0 + content << content_tag('li', link_to(l(:label_sort_by_time), {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '1'})) + content << content_tag('li', link_to(l(:label_sort_by_active), {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '0'}, :class=>"selected"), :class=>"selected") + + when 1 + content << content_tag('li', link_to(l(:label_sort_by_time), {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '1'}, :class=>"selected"), :class=>"selected") + content << content_tag('li', link_to(l(:label_sort_by_active), {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '0'})) + end + content = content_tag('ul', content) + content_tag('div', content, :class => "tabs") + end end + + diff --git a/app/helpers/user_score_helper.rb b/app/helpers/user_score_helper.rb index 5b455a01b..43ee05db8 100644 --- a/app/helpers/user_score_helper.rb +++ b/app/helpers/user_score_helper.rb @@ -54,57 +54,111 @@ module UserScoreHelper watcher_count = Watcher.where("watchable_type = 'principal' AND watchable_id = ?", user.id).count end + + + def calculate_skill_count(user) - praise_count = 0 - tread_count = 0 + praise_count_l0 = 0 + praise_count_l1 = 0 + praise_count_l2 = 0 + tread_count_l0 = 0 + tread_count_l1 = 0 + tread_count_l2 = 0 issues = Issue.where('author_id = ?', user.id) issues.each do |i| - ptcs = PraiseTreadCache.where('object_id = ?', i.id) - ptcs.each do |p| - praise_count = praise_count + p.praise_num - tread_count = tread_count + p.tread_num + pts = PraiseTread.where('praise_tread_object_id = ?', i.id) + pts.each do |p| + templevel = calculate_level(User.find(p.user_id)) + + if templevel.to_i == 0 + if p.praise_or_tread == 1 + praise_count_l0 = praise_count_l0 + 1 + else + tread_count_l0 = tread_count_l0 + 1 + end + end + if templevel.to_i == 1 + if p.praise_or_tread == 1 + praise_count_l1 = praise_count_l1 + 1 + else + tread_count_l1 = tread_count_l1 + 1 + end + end + if templevel.to_i == 2 + if p.praise_or_tread == 1 + praise_count_l2 = praise_count_l2 + 1 + else + tread_count_l2 + tread_count_l2 + 1 + end + end end end + + + bids = Bid.where('author_id = ?', user.id) bids.each do |b| - ptcs = PraiseTreadCache.where('object_id = ?', b.id) + ptcs = PraiseTread.where('praise_tread_object_id = ?', b.id) ptcs.each do |p| - praise_count = praise_count + p.praise_num - tread_count = tread_count + p.tread_num + templevel = calculate_level(User.find(p.user_id)) + + if templevel.to_i == 0 + if p.praise_or_tread == 1 + praise_count_l0 = praise_count_l0 + 1 + else + tread_count_l0 = tread_count_l0 + 1 + end + end + if templevel.to_i == 1 + if p.praise_or_tread == 1 + praise_count_l1 = praise_count_l1 + 1 + else + tread_count_l1 = tread_count_l1 + 1 + end + end + if templevel.to_i == 2 + if p.praise_or_tread == 1 + praise_count_l2 = praise_count_l2 + 1 + else + tread_count_l2 + tread_count_l2 + 1 + end + end end end contests = Contest.where('author_id = ?', user.id) contests.each do |c| - ptcs = PraiseTreadCache.where('object_id = ?', c.id) + ptcs = PraiseTread.where('praise_tread_object_id = ?', c.id) ptcs.each do |p| - praise_count = praise_count + p.praise_num - tread_count = tread_count + p.tread_num + templevel = calculate_level(User.find(p.user_id)) + + if templevel.to_i == 0 + if p.praise_or_tread == 1 + praise_count_l0 = praise_count_l0 + 1 + else + tread_count_l0 = tread_count_l0 + 1 + end + end + if templevel.to_i == 1 + if p.praise_or_tread == 1 + praise_count_l1 = praise_count_l1 + 1 + else + tread_count_l1 = tread_count_l1 + 1 + end + end + if templevel.to_i == 2 + if p.praise_or_tread == 1 + praise_count_l2 = praise_count_l2 + 1 + else + tread_count_l2 + tread_count_l2 + 1 + end + end end end - level = calculate_level(user) - - skill_score = 0 - - if level == 0 - skill_score = praise_count - 0.5 * tread_count - end - if level == 1 - skill_score = 2 * praise_count - 1.5 * tread_count - end - if level == 2 - skill_socre = 3 * praise_count - 2.5 * tread_count - end - if level == 3 - skill_socre = 4 * praise_count - 3.5 * tread_count - end - if level == 4 - skill_socre = 5 * praise_count - 4.5 * tread_count - end # case level # when 0 skill_score = praise_count - 0.5 * tread_count @@ -114,12 +168,19 @@ module UserScoreHelper # when 4 skill_socre = 5 * praise_count - 4.5 * tread_count # end - + skill_score = 2 * praise_count_l0.to_f + 3 * praise_count_l1.to_f + 4 * praise_count_l2.to_f + - 1 * tread_count_l0.to_f - 1.5 * tread_count_l1.to_f - 2 * tread_count_l2.to_f tread_user_count = PraiseTread.where('praise_or_tread = ? AND user_id = ?', 0, user.id).count - skill_score = skill_score - 0.5 * tread_user_count - + skill_score = skill_score.to_f - tread_user_count.to_f + + + + + + + return skill_score @@ -135,7 +196,7 @@ module UserScoreHelper issues.each do |i| ptcs = PraiseTreadCache.where('object_id = ?', i.id) ptcs.each do |p| - if p.praise_num > max_praise_num + if p.praise_num.to_i > max_praise_num.to_i max_praise_num = p.praise_num end end @@ -145,7 +206,7 @@ module UserScoreHelper bids.each do |b| ptcs = PraiseTreadCache.where('object_id = ?', b.id) ptcs.each do |p| - if p.praise_num > max_praise_num + if p.praise_num.to_i > max_praise_num.to_i max_praise_num = p.praise_num end end @@ -155,7 +216,7 @@ module UserScoreHelper contests.each do |c| ptcs = PraiseTreadCache.where('object_id = ?', c.id) ptcs.each do |p| - if p.praise_num > max_praise_num + if p.praise_num.to_i > max_praise_num.to_i max_praise_num = p.praise_num end end diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb index eb179718a..9b99b675c 100644 --- a/app/views/contests/_list_softapplications.html.erb +++ b/app/views/contests/_list_softapplications.html.erb @@ -14,7 +14,7 @@ 简介: - <%= c_softapplication.softapplication.description %> + <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
diff --git a/app/views/courses/_set_course_time.html.erb b/app/views/courses/_set_course_time.html.erb index d13d256c1..7f2b629c1 100644 --- a/app/views/courses/_set_course_time.html.erb +++ b/app/views/courses/_set_course_time.html.erb @@ -1,10 +1,13 @@ <% id = "finish_course_#{project.id}" - display = (project.course_extra.teacher.id == User.current.id ) + display = (project.course_extra.teacher.id == User.current.id || User.current.admin?) %> -<% if display && course_endTime_timeout?(project) #如果课程已结束%> - <%= link_to '重启课程', restartcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要重启课程？') %> +<% if display #如果课程已结束%> + <% linkPath = course_endTime_timeout?(project) ? restartcourse_project_path(project) : finishcourse_project_path(project, format: :js) %> + <% desc = course_endTime_timeout?(project) ? '重启' : '关闭' %> + + <%= link_to "#{desc}课程", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程？") %> <% else %> - <%= link_to '关闭课程', finishcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要关闭课程？') %> + <% end %> diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 98befd091..7552b9941 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -1,4 +1,132 @@ + + <%=(@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>资源共享区 @@ -88,9 +216,7 @@
<% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %> -
<%#需要交由浏览器异步刷新，或者一次连表查询，n+1 查询问题搞不定%> - <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%> -
+ <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 169f1a107..6a9c4b6c8 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,5 @@ <%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> + <% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %> <%= render :partial => 'action_menu' %> diff --git a/app/views/layouts/_base_softapplication_index_top_content.html.erb b/app/views/layouts/_base_softapplication_index_top_content.html.erb new file mode 100644 index 000000000..0a41036f1 --- /dev/null +++ b/app/views/layouts/_base_softapplication_index_top_content.html.erb @@ -0,0 +1,22 @@ +
+ + + + + + + + + + + +
创新竞赛社区<%= l(:label_user_location) %> : +
+ <%= text_field_tag 'name', params[:name], :size => 25 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> +
+
<%=link_to request.host()+"/softapplications", :controller=>'softapplications', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_softapplication), :controller=>'softapplications', :action=>'index' %> +
+
\ No newline at end of file diff --git a/app/views/projects/finishcourse.js.erb b/app/views/projects/finishcourse.js.erb index 35ecac370..2486bfffb 100644 --- a/app/views/projects/finishcourse.js.erb +++ b/app/views/projects/finishcourse.js.erb @@ -4,5 +4,5 @@ <% end %> $('#finish_course_<%=@project.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:project => @project} )%>") <% else %> - alert('设置失败，请在论坛提交问题，等待管理员处理。'); + alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。'); <% end %> diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb index 16a206508..950e822a3 100644 --- a/app/views/softapplications/index.html.erb +++ b/app/views/softapplications/index.html.erb @@ -1,4 +1,4 @@ -

参赛应用

+ + + + +<%=render :partial => 'layouts/base_softapplication_index_top_content'%> + +<% if @softapplications.size > 0%> + <%= sort_softapplication(@s_state)%> + +
+ <% @softapplications.each do |softapplication| %> +
+ <%= link_to softapplication.name, softapplication, :target => "_blank" %> + <%= rating_for softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %> + +
+
<%= image_tag('/images/app1.png')%>
+
<%= softapplication.description.truncate(95, omission: '...') %>
+
+ <%contest = softapplication.contests.first%> +

所属竞赛：<%= contest ? link_to(contest.name, show_softapplication_contest_path(contest) ) : '尚未加入竞赛'%>

+

所属类别：<%= softapplication.app_type_name %>

+

系统支持：<%= softapplication.android_min_version_available %>

+
+
+ 开发人员：<%= softapplication.application_developers %> + 发布时间：<%=format_time softapplication.created_at %> +
+
+
+ <% end %> +
+ +<% else %> + <%= render :partial => "layouts/no_content"%> +<% end %> + + + + +<% html_title l(:label_softapplication_list)%> \ No newline at end of file diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 32ab3474b..7d876d6c8 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -27,7 +27,7 @@ 所属类别：<%= @softapplication.app_type_name %> <% contest = @softapplication.contests.first %> - 所属竞赛：<%= contest ? link_to(contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%> + 所属竞赛：<%= contest ? link_to(contest.name, show_softapplication_contest_path(contest)) : '尚未加入竞赛'%> 发布人员：<%= @softapplication.user.name %> @@ -56,14 +56,40 @@
-
应用简介：
 -
<%= @softapplication.description.truncate(150, omission: '...') %>
+
应用简介：
 +
<%= @softapplication.description %>
+
+
+ +
+
应用得分：
+
+
+
得分比例
+
+ <% 100.step(20,-20) do |star| %> +
+
+
+
+
+
+ <%= @stars_status_map["star#{(star/20).to_s}".to_sym] %> +
+ <% end %> +
+
+
+
最终得分
+
<%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
+
+
软件截图：
 -
+
<% @image_results.take(4).each do |attachment| %> <%= link_to_attachment_img attachment, :class => "soft-application", :download => "true" %> <% end %> @@ -72,7 +98,18 @@
- +
软件评论：
评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb index 0aa1a5d95..eeef0f3da 100644 --- a/app/views/test/index.html.erb +++ b/app/views/test/index.html.erb @@ -12,14 +12,13 @@ <%= user.lastname %><%= user.firstname %> - - <%= user.changesets.count %> + <% end %> diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 6c89489c6..daeca6de4 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -201,7 +201,7 @@

最新参赛应用

- + <%= link_to "更多>>", {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %>
<% if Softapplication.count > 0%>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 8ad0cd6bf..b8b755b58 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -20,40 +20,37 @@
- <%= image_tag(@logoLink, size:'75x75') %> - -
-
- - - <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %> - <% else%> - <% if params[:school_id] == "0" %> - <% else %> - <% if params[:school_id].nil? %> + <%= image_tag(@logoLink, size:'75x75') %> - <%= School.find(User.current.user_extensions.school.id).name %> -
+
+
+
+ <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %> + <% else%> + <% if params[:school_id] == "0" %> <% else %> - <%= School.find(params[:school_id]).name %> -
+ <% if params[:school_id].nil? %> + <%= School.find(User.current.user_extensions.school.id).name %> +
+ <% else %> + <%= School.find(params[:school_id]).name %> +
+ <% end %> <% end %> - <% end %> - <% end %> - + <% end %> <%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %> - , <%= l(:label_welcome_trustie_course_description) %> + , <%= l(:label_welcome_trustie_course_description) %> <% else %> <% if params[:school_id] == "0" %> - , <%= l(:label_welcome_trustie_course_description) %> + , <%= l(:label_welcome_trustie_course_description) %> <% end %> <% end %> -
-
- <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course}%> -
-
+
+
+ <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course}%> +
+
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index e41260de1..3fdee2a97 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -96,22 +96,28 @@ <%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> <%= link_to "更多>>", forums_path %>
-
- <% find_new_forum_topics(7).each do |topic|%> -
  • -
    -       - <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %> - -
    - <%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前 - - 由 <%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %> 发表 - - 回复(<%= link_to (topic.parent ? topic.parent.replies_count : topic.replies_count), topic.event_url, :target => "_blank" %>) +
    + <% find_new_forum_topics(7).each do |topic|%> +
  • +
    + <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %> +
    +
    + + <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> + + + 楼主： <%= link_to_user(topic.author) %> + + + 最后回复：<%=link_to_user topic.last_reply.try(:author) %> + + + 回复(<%= link_to topic.try(:replies_count), topic.event_url %>) +
    • - <% end %> + <% end %>
    diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f4b6fe0ce..9acb5e592 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1425,7 +1425,7 @@ zh: label_has_praisers: 赞(%{count}) label_has_watchers: 关注(%{count}) label_has_fans: 粉丝(%{count}) - label_coursefile_sharingarea: 课程资源共享区 + label_coursefile_sharingarea: 课程文件共享专区 #modify by men label_x_has_fans: zero: 粉丝(%{count}) @@ -1547,7 +1547,6 @@ zh: label_sort_by_time: 按时间排序 label_sort_by_active: 按活跃度排序 label_sort_by_influence: 按影响力排序 - label_sort_by_activity: 按动态数排序 label_bids_published: 发布于 label_bids_published_ago: 之前 label_welcome_trustie: Trustie @@ -1668,7 +1667,7 @@ zh: label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。） label_course_view_student: 查看其他课程 label_course_student: 学生 - label_homework: 课程实践 + label_homework: 课程作业 label_course_file: 资源库 #资料共享 label_stores_index: 资源搜索 label_course_new_homework: 新建作业 @@ -1716,11 +1715,6 @@ zh: zero: 份资料 one: 份资料 other: 份资料 -#added by gcm - label_x_activity: - zero: 个动态 - one: 个动态 - other: 个动态 @@ -1765,13 +1759,13 @@ zh: label_has_been: 已经被 label_course_userd_by: 个课程引用 + role_of_course: 课程角色 + label_student: 学生 + #added by Wen label_school_all: 中国高校 - role_of_course: 课程角色 - label_student: 学生 - label_project_grade: 项目得分 label_user_grade: 个人得分 label_user_for_project_grade: 个人得分 @@ -1829,8 +1823,7 @@ zh: label_sumbit_empty: 搜索内容不能为空 #add by linchun (竞赛相关) - label_upload_files: 上传资源 - label_relation_files: 关联已有资源 + label_upload_files: 上传文件 label_upload_softwarepackage: 上传软件包 label_upload_cuttingphoto: 上传截图 label_contests_reward_method: 奖励方式 @@ -1869,8 +1862,20 @@ zh: label_add_contest_succeed_fail: 添加失败,该应用已参赛. label_no_ftapplication: 暂无应用 label_edit_softapplication: 修改应用 - label_contest_settings: 配置竞赛 label_contest_delete: 删除竞赛 + label_softapplication_list: 应用列表 - - + label_coursefile_sharingarea: 课程资源共享区 + label_sort_by_activity: 按动态数排序 + label_homework: 课程实践 + label_x_activity: + zero: 个动态 + one: 个动态 + other: 个动态 + label_school_all: 中国高校 + label_upload_files: 上传资源 + label_relation_files: 关联已有资源 + label_contest_settings: 配置竞赛 + label_contest_delete: 删除竞赛 + label_school_all: 学校列表 + \ No newline at end of file diff --git a/public/images/school/1578.png b/public/images/school/1578.png deleted file mode 100644 index 84340ace5..000000000 Binary files a/public/images/school/1578.png and /dev/null differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 36a8a61ca..723b93bd6 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -37,7 +37,7 @@ div.position-f{ } div.position-f p.font{ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color: #15bccf; @@ -57,7 +57,7 @@ div.position-s p.font{ div.position-t{ padding-top: 13px; float: left; - width: width: 238px; + width: 238px; line-height: 0.5em; } @@ -83,7 +83,7 @@ div.sidebar-user{ border: 1px solid #e5dfc7; float: left; display: block; - height：80px; + height:80px; width: 80px; } @@ -100,7 +100,7 @@ div.sidebar-user{ div.sidebar-f div.name{ float: left; padding-left: 8px; - font-family:微软雅黑; + font-family:"Microsoft YaHei"; font-weight:bold; font-size:16px; color:#4d4d4d; @@ -228,7 +228,7 @@ div.forums-info{ } div.forums-title{ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color: rgb(237, 137, 36); @@ -251,7 +251,7 @@ span.forums-avatar-right{ } .formus-first-title{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; padding-top:3px; padding-bottom:3px; @@ -262,7 +262,7 @@ span.forums-avatar-right{ width: 290px; white-space: nowrap; overflow: hidden; - -o-text-overflow: ellisis; + -o-text-overflow: ellipsis; text-overflow: ellipsis; } .contextual-borad{ @@ -374,7 +374,7 @@ span.forums-avatar-right{ width: 430px; white-space: nowrap; overflow: hidden; - -o-text-overflow: ellisis; + -o-text-overflow: ellipsis; text-overflow: ellipsis; } @@ -382,7 +382,7 @@ span.forums-avatar-right{ width: 650px; white-space: nowrap; overflow: hidden; - -o-text-overflow: ellisis; + -o-text-overflow: ellipsis; text-overflow: ellipsis; } @@ -468,7 +468,7 @@ span.forums-avatar-right{ } a.bids_user { - font-family:微软雅黑; + font-family:"Microsoft YaHei"; color:#15bccf; font-size:14px; font-weight: bold; @@ -519,23 +519,23 @@ ul.tool li{list-style-type:none; height:auto;} .font_index{ font-size:22px; - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; color:#068d9c; } .font_aram{ font-size: 14px; - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; } .font_content{ font-size:14px; - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; color:#FFFFFF; } .time_project{ font-size:12px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; } .line_bottom{ margin-top: 1px; @@ -548,7 +548,7 @@ ul.tool li{list-style-type:none; /*white-space:nowrap;*/ overflow: hidden; height:35px; - width：200px; + width:200px; text-align: left; font-family: arial; font-size:12px; @@ -573,7 +573,7 @@ ul.tool li{list-style-type:none; } .font_title_tag{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; padding-top:3px; padding-bottom:3px; @@ -582,7 +582,7 @@ ul.tool li{list-style-type:none; } .font_title_left{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; padding-left: 10px; padding-top:3px; @@ -591,7 +591,7 @@ ul.tool li{list-style-type:none; /*color:#05a8bb;*/ } .font_small_watch{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; color:#15bccf; } @@ -607,7 +607,7 @@ ul.tool li{list-style-type:none; } .font_welcome{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color:#6d6e6e; @@ -624,17 +624,17 @@ ul.tool li{list-style-type:none; font-family: Tahoma,"Microsoft YaHei"; font-weight: bold; font-size: 20px; - color:#FF9900; + color:#e8770d; } .font_welcome_Cdescription{ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; font-size: 16px; color: #5c5c5c; } .font_welcome_tdescription{ - font-family: '微软雅黑'; + font-family: "Microsoft YaHei"; font-size: 16px; color: #5c5c5c; text-align: justify; @@ -654,7 +654,7 @@ ul.tool li{list-style-type:none; border: 1px solid #e5dfc7; float: left; display: block; - height：80px; + height:80px; width: 80px; } @@ -675,7 +675,7 @@ ul.tool li{list-style-type:none; } .font_welcome_feature{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight: bold; font-size: 16px; color:#09b2c8; @@ -684,7 +684,7 @@ ul.tool li{list-style-type:none; .info-course{ padding-left: 8px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; font-size:16px; color:#4d4d4d; @@ -699,7 +699,7 @@ ul.tool li{list-style-type:none; .info_font{ padding-left: 8px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-weight:bold; font-size:16px; color:#4d4d4d; @@ -707,7 +707,7 @@ ul.tool li{list-style-type:none; word-break: break-all; } .font_lighter{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; color:#acaeb1; font-size:13px; } @@ -717,7 +717,7 @@ ul.tool li{list-style-type:none; font-size:13px; } .font_lighter2{ - font-family:'微软雅黑'; + font-family: "Microsoft YaHei"; color:#9a9a9a; font-size:14px; } @@ -725,7 +725,7 @@ ul.tool li{list-style-type:none; .font_lighter_welcome{ color:#acaeb1; font-size:12px; - font-family:微软雅黑; + font-family: "Microsoft YaHei"; } .justify_side > span{ text-align: justify; @@ -754,7 +754,7 @@ ul.tool li{list-style-type:none; padding-left: 10px; } .font_tool{ - font-family:微软雅黑; + font-family: "Microsoft YaHei"; font-size:14px; color: #1a1a1a; padding-left: 6px; @@ -768,7 +768,7 @@ ul.tool li{list-style-type:none; float:left; display:inline-block; /*margin-top: 50px;*/ - padding-left: 20px; + /*padding-left: 20px;*/ max-width: 315px; margin: 0; padding: 0; @@ -915,7 +915,7 @@ ul.user_project_sort li{list-style-type:none; /*h写的样式*/ .lbadding{float:left; padding-left: 10px} /*huang*/ .rlbadding{float:left; padding-left: 0px; margin-top:40px} /*huang*/ -.lbadding h7{letter-spacing: -0.0125em; font-weight:700}/*未用*/ +/*.lbadding h7{letter-spacing: -0.0125em; font-weight:700}*//*未用*/ .newsplitcontentright{float:right; width:49%;}/*huang*/ .newsplitcontentleft{float:left; width:49%;}/*huang*/ .newsplitcontentall{float:left; padding-left: 30px; width:95%} @@ -946,17 +946,20 @@ a.logical_int{ color: #ed8924; } -.contextdescription2{font-family: '微软雅黑'; - font-size:12px; - font-weight:ligher; - color:#7e7e7e; - } +.contextdescription2 { + font-family: "Microsoft YaHei"; + font-size: 12px; + font-weight: lighter; + color: #7e7e7e; +} ul.context_projects{margin:0px; padding-left:0em;} ul.context_projects ul {padding-left:1.6em;} -ul.context_projects li {list-style-type:none; - height:50px;} +ul.context_projects li { + list-style-type:none; + height:50px; +} /*字体*/ .more{float:right; padding-right:40px; text-decoration: underline; color: #95c3bc} @@ -984,7 +987,7 @@ ul.context_projects li {list-style-type:none; padding-top:12px; font-family: arial; font-size:12px; - font-weight:ligher; + font-weight:lighter; color:#7e7e7e; } @@ -998,7 +1001,7 @@ ul.context_projects li {list-style-type:none; .fontligher{ font-family: arial; font-size:12px; - font-weight:ligher; + font-weight:lighter; color:#505050; height: 34px; @@ -1058,14 +1061,14 @@ ul.context_projects li {list-style-type:none; font-size:24px; font-weight:bold; - text-decoration:; + text-decoration:none; color:#000000; } .firdtname_project{ font-size:12px; font-weight:bold; - text-decoration:; + text-decoration:none; color:#116699; @@ -1080,8 +1083,8 @@ ul.context_projects li {list-style-type:none; text-decoration: underline; } .last_active{ - color:AA9C84; - font-size:12px + color: #AA9C84; + font-size:12px; text-decoration: none; } ul.newprojects{ /*huang*/ @@ -1103,16 +1106,16 @@ ul.newprojects li{ /*huang 块状*/ border-bottom:5px #DBEDF4 solid; border-left:2px dotted #DBEDF4; min-height:260px; - line-height: :30px; + line-height: 30px; } -ul.newprojects li documenttext{ /*未wan*/ +/*ul.newprojects li documenttext{ *//*未wan*/ /*overflow: hidden;*/ - height: 260px; - width: 200px; - margin-right:auto; - - padding-top:10px; -} + /*height: 260px;*/ + /*width: 200px;*/ + /*margin-right:auto;*/ + /**/ + /*padding-top:10px;*/ +/*}*/ ul.newprojects2{ /*huang*/ margin: 0px; padding-left: 2em; @@ -1133,7 +1136,6 @@ ul.newprojects2 li{ .newfeedback h1{ color: inherit; - text-d } /***** Layout *****/ #wrapper {background: white;} @@ -1389,7 +1391,7 @@ table.attributes { width: 100% } table.attributes th { vertical-align: top; text-align: left; } table.attributes td { vertical-align: top; } -table.boards a.board, h3.comments { /*background: url(../images/comment.png) */no-repeat 0% 50%; padding-left: 5px; } +/*table.boards a.board, h3.comments {*background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 5px; }*/ table.boards td.topic-count, table.boards td.message-count {text-align:center;} table.boards td.last-message {font-size:80%;} @@ -1478,7 +1480,7 @@ margin-left:-10px; .project_right_tag{margin-top:44%;} .project_homepage_tag{float:left; margin-top:9%;color:#000000;} -.project_infor_tag{float:auto;color:#000000;padding-left: 15px;} +.project_infor_tag{/*float:auto;*/color:#000000;padding-left: 15px;} .project_page_tag{float:right;color:#C0C0C0; font-family: '微软雅黑';font-size: 13px;} .wiki_text{font-size:small;color:#000000;} .user_setting{float:right; color:#000000;padding-right: 10px;} @@ -1486,13 +1488,13 @@ margin-left:-10px; .project_right_tag{margin-top:40%;} .project_homepage_tag{padding-left:570px;color:#000000;} -.project_infor_tag{float:auto;color:#000000;padding-left: 15px; } +.project_infor_tag{/*float:auto;*/color:#000000;padding-left: 15px; } .project_page_tag{float:right;color:#C0C0C0; font-family: '微软雅黑';font-size: 13px;} .wiki_text{font-size:small;color:#000000;} .user_setting { float:right; - color:#000000; + /*color:#000000;*/ padding-right:10px; background-color: #CCCCBB; border-radius: 5px 5px 5px 5px; @@ -1523,7 +1525,7 @@ margin-left:-10px; margin-top: 50px; width:320px; - + /*font-family:微软雅黑,lucida grande,verdana;*/ font-size:12px; -webkit-border-radius:10px; @@ -1540,15 +1542,15 @@ margin-left:-10px; form {display: inline;} /*added by bai*/ - input[type="submit"].bid_btn { - padding-bottom: 5px; - width: 55px; - height: 25px; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; +input[type="submit"].bid_btn { + padding-bottom: 5px; + width: 55px; + height: 25px; + font-family: '微软雅黑', Arial, Helvetica, sans-serif; font-size: 12px; color: #fff; padding: 0px; - background: #15bccf; + background: #15bccf; border-radius: 4px; border: 1px solid #15bccf; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; @@ -1557,20 +1559,20 @@ form {display: inline;} } input[type="button"].bid_btn { - padding-bottom: 5px; - width: 55px; - height: 25px; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; + /*padding-bottom: 5px;*/ + width: 55px; + height: 25px; + font-family: '微软雅黑', Arial, Helvetica, sans-serif; font-size: 12px; color: #fff; padding: 0px; - background: #15bccf; + background: #15bccf; border-radius: 4px; border: 1px solid #15bccf; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); cursor: pointer; - } +} /*end */ fieldset {border: 1px solid #e4e4e4; margin:0;} @@ -1588,9 +1590,9 @@ blockquote { padding-bottom: 0.6em; margin-left: 1.4em; margin-right: 0.4em; - border-radius: 4px; # added by bai (边框变圆润) - font-family: 微软雅黑; - background: url(/images/requirements/reference.jpg) + border-radius: 4px; + font-family: "Microsoft YaHei"; + background: url('../images/requirements/reference.jpg') } blockquote blockquote { margin-left: 0;} @@ -1631,7 +1633,7 @@ fieldset#filters td.values select {min-width:130px;} fieldset#filters td.values input {height:1em;} fieldset#filters td.add-filter { text-align: right; vertical-align: top; } -.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png)*/ no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;} +.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%;*/ padding-left:8px; margin-left:0; cursor:pointer;} .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} @@ -1763,7 +1765,7 @@ p.pagination {margin-top:8px; font-size: 90%} margin: 0; padding: 3px 0 3px 0; padding-left: 100px; /* width of left column containing the label elements *//*by young*/ - /*/*min-height: 1.8em;*/ by bai*/ + /*min-height: 1.8em;*/ clear:left; } @@ -2114,7 +2116,7 @@ button.tab-right { } #content .tabs_new ul li a.selected { - background-color: rgba(28, 158, 199, 0.68); # added by bai + background-color: rgba(28, 158, 199, 0.68); border: 1px solid #15BCCF; border-bottom: 1px solid #fff; color:#FFF; @@ -2186,7 +2188,7 @@ button.tab_new-right { } #content .tabs_new_enterprise ul li a.selected { - background-color: #9f4056; # added by bai + background-color: #9f4056; border: 1px solid #ac344f; border-bottom: 1px solid #fff; color:#FFF; diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index 8e44135b8..9be876239 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -1,3 +1,8 @@ + /* + * 再添加的时候按照功能划分区块，随便加的被删掉自负 + */ + /************************** 某部分开始 *****************************/ + /************************** 某部分结束 *****************************/ .top_bar{ height: auto; } @@ -285,8 +290,8 @@ div#tooltip::after { background-color: #FCE6EA; text-decoration: none; border-top: 1px solid #FFFFFF; - border-left: 1px solid #FFFFFF: - border-bottom: 1px solid #717171; + border-left: 1px solid #FFFFFF; + border-bottom: 1px solid #717171; border-right: 1px solid #717171; } .inner-content a:hover{ @@ -376,4 +381,66 @@ a.attachments_list_color { padding: 0 6px; line-height: 1.3em; margin-bottom: 3px; -} \ No newline at end of file +} + /************************** 贴吧动态 开始 *****************************/ + /*贴吧活动*/ +.memo_activity{ + +} +/*帖子li*/ +.memo_activity .message-brief-intro{ + line-height: 1.76em; + padding:3px; + margin:3px; +} +/*帖子中的链接*/ +.memo_activity a { + color: #105CB6; +} +/*帖子标题*/ +.memo_activity .memo_title{ + display: inline-block; + margin-bottom: 3px; + padding-left: 20px; + background: url('/images/list-icon.png') no-repeat scroll; + background-position: left center; + font-size: 10pt; +} +/*帖子的各种属性*/ +.memo_activity .memo_attr{ + margin-left: 20px; +} +/*帖子的时间*/ +.memo_activity .memo_timestamp{ + color: #999999; + white-space: nowrap; + font-size: 9pt; +} +/*帖子的作者*/ +.memo_activity .memo_author{ + margin-left: 8px; + margin-bottom: 0px; + color: #999999; + white-space: nowrap; + font-size: 9pt; +} +.memo_activity span a{ + color: gray; +} +/*帖子的最后回复人*/ +.memo_activity .memo_last_person{ + margin-left: 8px; + margin-bottom: 0px; + color: #999999; + white-space: nowrap; + font-size: 9pt; +} +/*帖子的总回复数量*/ +.memo_activity .memo_reply{ + float: right; + color: rgb(172, 174, 177); + white-space: nowrap; + font-size: 10pt; +} + + /************************** 贴吧动态 结束 **************************** \ No newline at end of file diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 306d6d113..2c93cca06 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -66,7 +66,9 @@ a .action-settings #header h1:before { font-family: Fontawesome; - + /* content: "\f0f0 ";*/ + padding-right: 5px; +} /*by young*/ .action-settings #header h1:before @@ -190,11 +192,7 @@ a .controller-gantts #header h1:before { font-family: Fontawesome; - - - /* content: "\f080";*/ - padding-right: 5px; } @@ -210,25 +208,16 @@ a .controller-welcome #header h1:before { font-family: Fontawesome; - - - -/* content: "\f015 ";*/ - +/* content: "\f015 ";*/ padding-right: 5px; font-weight: 100; } .controller-users #header h1:before { font-family: Fontawesome; - - padding-right: 5px; } -/* content: "\f0f0 ";*/ - padding-right: 5px; -} /*end*/ @@ -373,11 +362,10 @@ ul.projects li.root background-color:#fff; /*顶层导航颜色*/ color: #fff; font-size:13px; /* bai */ - font-family: 微软雅黑; + font-family: "Microsoft YaHei"; position:relative; padding:0; height:1px; - padding-top:0; /*by bai*/ border-radius: 5px;/*导航栏边角变圆*/ /*end*/ @@ -403,7 +391,6 @@ ul.projects li.root { /*by young*/ color:#fff; /*the color of the fonts*/ - font-weight:6px; padding:4px 3px } @@ -454,7 +441,7 @@ ul.projects li.root #main.nosidebar #content_ { width:auto; - float:center; + /*float:center;*/ min-height:800px; border: 1px solid #ffffff; } @@ -537,7 +524,7 @@ ul.projects li.root margin:4px 20px 20px; padding-bottom:15px; text-align:left - font-size: 18px; + /*font-size: 18px;*/ } #footer a:hover @@ -664,8 +651,8 @@ div.splitcontentleft h2 position:relative; z-index: 2; background: #fff;*/ - font-family:微软雅黑, "PT Sans", Helvetica, Arial; - font: color: #FFF; + /*font-family:"Microsoft YaHei", "PT Sans", Helvetica, Arial;*/ + /*font: color: #FFF;*/ transition:all .4s linear; -moz-transition:all .4s linear; -o-transition:all .4s linear; @@ -695,8 +682,9 @@ div.splitcontentleft h2 } #top-menu li a.my-page:before { font-family: Fontawesome; - content: "\f0c9 "; - + content: "\f0c9 "; + /* content: "\f0f0 ";*/ +} /*by young*/ #top-menu li a.home:before { font-family: Fontawesome; @@ -745,9 +733,6 @@ div.splitcontentleft h2 content: "\f08b "; } - -/* content: "\f0f0 ";*/ -} #top-menu #account a.logout:before { font-family: Fontawesome; /* content: "\f08b ";*/ @@ -1065,7 +1050,7 @@ input[type="submit"] html > body #content { - min-height:auto!important + /*min-height:auto !important;*/ } pre,code,.line-code @@ -1479,7 +1464,6 @@ div.pagination span { -moz-border-bottom-colors: none; border-image: none; } -} div.pagination span.current-page { /*color: rgb(153, 153, 153); add by huang*/ @@ -1548,7 +1532,6 @@ div.pagination_new span { -moz-border-bottom-colors: none; border-image: none; } -} div.pagination_new span.current-page { color: rgb(153, 153, 153); @@ -1745,7 +1728,7 @@ div.project-search-block { margin-bottom: 0px; padding: 10px; width: 95%; - border-top： 1px solid rgb(242,242,242); + border-top: 1px solid rgb(242,242,242); /*border-bottom: 1px solid rgb(223, 223, 223);*/ margin-left: auto; margin-right: auto; @@ -1833,7 +1816,7 @@ a.usage { /*end*/ a.bid_user { - font-family:微软雅黑; + font-family:"Microsoft YaHei"; color:#acaeb1; font-size:12px; } @@ -1850,7 +1833,7 @@ a.bid_course{ } a.bids_user { - font-family:微软雅黑; + font-family:"Microsoft YaHei"; color:#15bccf; font-size:14px; font-weight: bold; @@ -1866,10 +1849,10 @@ input[type='text'].noline { .noline { /*border-style: none; border-color: white;*/ - font-family:微软雅黑; /*modify by men*/ + font-family:"Microsoft YaHei"; /*modify by men*/ border: #d5dee9 1px solid; font-size: 12px; - color: #818283; # modified by bai + color: #818283; padding: 9px 5px; width: 98%; cursor: text; @@ -2096,7 +2079,7 @@ ul.message-for-user { list-style-type: none; margin: 0px; padding: 0px; - font-family: 微软雅黑,Verdana,sans-serif,宋体; + font-family: "Microsoft YaHei",Verdana,sans-serif,simsun; text-align: left; font-size: 10pt; width: 100%; @@ -2247,130 +2230,4 @@ ul.messages-for-user-reply li { .footer_text_link{ margin: 0px 5px; } -/*gcm*/ - -#ver-zebra, .file_table_des -{ - font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; - font-size: 12px; - margin: 5px 10px; - width: 98%; - text-align: left; - border-collapse: collapse; - line-height: 20px; - font-size: 14px; -} -#ver-zebra th -{ - font-size: 14px; - font-weight: normal; - padding: 12px 15px; - border-right: 1px solid #fff; - border-left: 1px solid #fff; - color: #039; - text-align: left; -} -#ver-zebra td -{ - padding: 8px 15px; - border-right: 1px solid #fff; - border-left: 1px solid #fff; - color: #669; -} -#ver-zebra td.description { - background-color: white; - padding: 0px; - margin: 0px auto; -} -div.tags_area { - padding: 2px 10px 10px 10px; - margin: 0px; - margin-bottom: 10px; - /*border-bottom: 1px dashed #CCCCCC;*/ - overflow: hidden; - position: relative; -} -.tags_gradint { -} -.read-more{ - padding: 5px; - border-top: 4px double #ddd; - background: #fff; - color: #333; -} -.read-more a{ - padding-right: 22px; - background: url() no-repeat 100% 50%; - font-weight: bold; - text-decoration: none; -} -.read-more a:hover{ - color: #000; -} -.vzebra-odd -{ - background: #eff2ff; -} -.vzebra-even -{ - background: #e8edff; -} -#ver-zebra #vzebra-adventure, #ver-zebra #vzebra-children -{ - background: #ffffff; - border-bottom: 1px solid #c8d4fd; -} -#ver-zebra #vzebra-comedy, #ver-zebra #vzebra-action -{ - background: #ffffff; - border-bottom: 1px solid #d6dfff; -} -.filename{ - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} -div.pagination{ - margin: 10px 0px; - height: 1.5em; - text-align: left; - font-size: 13px; -} -.m5p5{ - display: inline-block; - height: auto; - color: white !important; - margin: 8px; - padding: 3px 7px; -} -.m5p5:hover { - text-decoration: none; - /*padding-bottom: 3px;*/ - /*border-bottom: 1px solid #666666;*/ - border-radius: 4px; - border: 1px solid #15bccf; - box-shadow: 3px 3px 3px #666666; -} -.relation_file_div{ - margin: 0px 25px; -} -.relation_file_div fieldset{ - margin: 0px 0px; - padding: 10px; - border-radius: 5px; - transition: all 2s linear 1s; -} -.relation_file_div input#attach_search:focus{ - border: 1px solid #1B95C6; - box-shadow: 0px 0px 4px #1B95C6; - width: 200px; -} -.relation_file_div input#attach_search{ - width: 150px; - outline: none; - border-radius: 5px; - -webkit-transition: 1s width; - -moz-transition : 1s width; - -o-transition : 1s width; - transition : 1s width; -} \ No newline at end of file +/*gcm*/ \ No newline at end of file