diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 5666934b6..477a8e2b9 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -346,11 +346,16 @@ class AdminController < ApplicationController #学校列表 def schools @school_name = params[:school_name] - if @school_name + if @school_name && @school_name != '' @schools = School.where("name like '%#{@school_name}%'") - else - @schools = School.all + elsif @school_name.nil? + @schools = [] + else @school_name && @school_name == ' ' + @schools = School.where('1=1') end + @school_count = @schools.count + @school_pages = Paginator.new @school_count, per_page_option, params['page'] || 1 + @schools = paginateHelper @schools,100 respond_to do |format| format.html end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b18d0c706..ce11bded8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2351,7 +2351,7 @@ module ApplicationHelper def user_for_homework_common homework,is_teacher if User.current.member_of_course?(homework.course) if is_teacher #老师显示作品数量 - link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue" + link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue" else #学生显示提交作品、修改作品等按钮 work = cur_user_works_for_homework homework if work.nil? @@ -2366,6 +2366,8 @@ module ApplicationHelper end end end + else + link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue" end end diff --git a/app/views/admin/schools.html.erb b/app/views/admin/schools.html.erb index 0956981e8..d19e9b3b9 100644 --- a/app/views/admin/schools.html.erb +++ b/app/views/admin/schools.html.erb @@ -46,5 +46,8 @@ + <% html_title(l(:label_project_plural)) -%> diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index ef16d0c23..5c0120f11 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -71,7 +71,8 @@ $(function () { init_activity_KindEditor_data(<%= topic.id%>, null, "87%"); - var description_images=$("div#activity_description_<%= topic.id %>").find("img"); + showNormalImage('activity_description_<%= topic.id %>'); + /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img"); if (description_images.length>0) { for (var i=0; i a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); - - var reply_images=$("div#reply_content_<%= topic.id %>").find("img"); - if (reply_images.length>0) { - for (var i=0; i").attr("href",image.attr('src')); - image.wrap(element); - } - } - $('#reply_content_<%= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); + $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/ }); <% if topic %> diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 74856197e..aa99236df 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -74,25 +74,7 @@ $(function () { init_activity_KindEditor_data(<%= activity.id%>, null, "87%"); - var description_images=$("div#activity_description_<%= activity.id %>").find("img"); - if (description_images.length>0) { - for (var i=0; i").attr("href",image.attr('src')); - image.wrap(element); - } - } - $('#activity_description_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); - - var reply_images=$("div#reply_content_<%= activity.id %>").find("img"); - if (reply_images.length>0) { - for (var i=0; i").attr("href",image.attr('src')); - image.wrap(element); - } - } - $('#reply_content_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); + showNormalImage('activity_description_<%= activity.id %>'); }); <% if activity && activity.course_act%> diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb index 1cdbbd6df..cff80a15d 100644 --- a/app/views/layouts/base_admin.html.erb +++ b/app/views/layouts/base_admin.html.erb @@ -12,7 +12,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','project', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= heads_for_theme %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 53b972025..efcd15a66 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -100,7 +100,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-
<%= reply.author.name%><%= format_date(reply.created_at) %>
+
<%= reply.author.name%><%= format_date(reply.created_at) %>
<%= reply.content.html_safe%>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 1611bc725..79142c441 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -25,6 +25,7 @@ } $(function() { init_activity_KindEditor_data(<%= @topic.id%>,null,"85%"); + showNormalImage('message_description_<%= @topic.id %>'); });
@@ -73,7 +74,7 @@
<%= format_time( @topic.created_on)%>
-
+
<%= @topic.content.html_safe%>
@@ -97,6 +98,11 @@
<% @replies.each_with_index do |reply,i| %> +
<%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> @@ -109,7 +115,9 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> <% end %>
-
<%= reply.content.html_safe%>
+
+ <%= reply.content.html_safe%> +
<%= format_time(reply.created_on) %>
\ No newline at end of file diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb index 3e9550ee2..a859a088a 100644 --- a/app/views/messages/_reply_message.html.erb +++ b/app/views/messages/_reply_message.html.erb @@ -16,8 +16,8 @@
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %> - - + +
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb index 78ba0c142..eee820c61 100644 --- a/app/views/messages/quote.js.erb +++ b/app/views/messages/quote.js.erb @@ -9,6 +9,8 @@ $("img").removeAttr("align");*/ if($("#reply_message_<%= @message.id%>").length > 0) { $("#reply_message_<%= @message.id%>").replaceWith("<%= escape_javascript(render :partial => 'reply_message', :locals => {:reply => @message,:temp =>@temp,:subject =>@subject}) %>"); $(function(){ + $('#reply_subject').val("<%= raw escape_javascript(@subject) %>"); + $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>"); init_activity_KindEditor_data(<%= @message.id%>,null,"85%"); }); }else if($("#reply_to_message_<%= @message.id%>").length >0) { diff --git a/app/views/school/add_school.js.erb b/app/views/school/add_school.js.erb index 181c4e03b..9ebecb682 100644 --- a/app/views/school/add_school.js.erb +++ b/app/views/school/add_school.js.erb @@ -1 +1,2 @@ -$("input[name='occupation']").val('<%= @school.id%>'); \ No newline at end of file +$("input[name='occupation']").val('<%= @school.id%>'); +$("#hint").html('创建成功').show(); \ No newline at end of file diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index d0f4f82b7..e28cdb1e2 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -35,11 +35,19 @@
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 699b20216..97213283e 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.tea_id), :alt => "用户头像" %>
-
+
<% if activity.try(:teacher).try(:realname) == ' ' %> <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %> <% else %> diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 703a52c32..2d3bc68de 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -5,7 +5,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> @@ -24,12 +24,10 @@ 匿评已结束 <% end%>
- <% if User.current.member_of_course?(activity.course) %> -
- <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %> - <%= user_for_homework_common activity,is_teacher %> -
- <% end %> +
+ <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %> + <%= user_for_homework_common activity,is_teacher %> +
<% if activity.homework_type == 2 && is_teacher%>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index 93e7f0c29..28cb368d6 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -48,6 +48,11 @@
    <% course.journals_for_messages.where('m_parent_id IS NULL').reorder("created_on desc").each do |comment| %> + <% replies_all_i = replies_all_i + 1 %>
  • @@ -62,9 +67,14 @@ <% end %> <%= format_time(comment.created_on) %>
    -
    +
    <%= comment.notes.html_safe %>
    <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %> +
    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.user_id), :alt => "用户头像" %> @@ -84,7 +94,7 @@ <% end %> <%= format_time reply.created_on %>
    -
    +
    <%= reply.notes.html_safe %>
    diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 7fe15bd1e..d9574dc0b 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> @@ -23,6 +23,9 @@ <% if activity.sticky == 1%> 置顶 <% end%> + <% if activity.locked%> +        + <% end%>
    发帖时间：<%= format_time(activity.created_on) %> @@ -56,7 +59,7 @@ <% count=activity.children.count%> <% end %>
    -
    +
    回复( <%= count %> @@ -77,13 +80,18 @@
      <% activity.children.reorder("created_on desc").each do |reply|%> + <% replies_all_i=replies_all_i+1 %>
    • - <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
      -
      +
      <% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> <% else %> @@ -91,7 +99,7 @@ <% end %> <%= format_time(reply.created_on) %>
      -
      +
      <%= reply.content.html_safe %>
      @@ -102,6 +110,7 @@
      <% end %> + <% if !activity.locked? && authorize_for_course('messages', 'reply') %>
      <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
      @@ -121,5 +130,6 @@
      + <% end %>
    diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index c74b43031..bc0306ee9 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -46,13 +46,18 @@
      <% activity.comments.reorder("created_on desc").each do |comment| %> + <% replies_all_i = replies_all_i + 1 %>
    • - <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.author_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
      -
      +
      <% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> @@ -60,7 +65,7 @@ <% end %> <%= format_time(comment.created_on) %>
      -
      +
      <%= comment.comments.html_safe %>
      diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 0b91a6ed3..8bbdadc1a 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -1,48 +1,48 @@ -<% has_commit = has_commit_poll?(activity.id ,User.current)%> -<% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> -<% if ( activity.polls_status==2) %> -
      -
      -
      - - <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %> -
      -
      -
      - <% if activity.try(:user).try(:realname) == ' ' %> - <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> - <% else %> - <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> - <% end %> - TO - <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %> - -
      -
      - <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> - <% if has_commit %> - <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> - <% else %> - <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%> - <% end %> -
      -
      - 发布时间：<%= format_time(activity.published_at) %> -
      -
      <%=activity.polls_description.html_safe.to_s%>
      - -
      -
      -
      -
      +<% has_commit = has_commit_poll?(activity.id ,User.current)%> +<% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> +<% if ( activity.polls_status==2) %> +
      +
      +
      + + <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %> +
      +
      +
      + <% if activity.try(:user).try(:realname) == ' ' %> + <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %> + +
      +
      + <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> + <% if has_commit %> + <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> + <% else %> + <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%> + <% end %> +
      +
      + 发布时间：<%= format_time(activity.published_at) %> +
      +
      <%=activity.polls_description.html_safe.to_s%>
      + +
      +
      +
      +
      <% end %> \ No newline at end of file diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 5215e9ccc..b98356c7b 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -1,29 +1,29 @@ -
      -
      -
      - 用户头像
      -
      -
      尹教授 TO - 分布式计算环境(课程名称)
      -
      - ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）
      -
      -
      提交（10）
      -
      截止时间：2015-08-20
      -
      -
      （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
      - -
      -
      -
      +
      +
      +
      + 用户头像
      +
      +
      尹教授 TO + 分布式计算环境(课程名称)
      +
      + ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）
      +
      +
      提交（10）
      +
      截止时间：2015-08-20
      +
      +
      （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
      + +
      +
      +
      \ No newline at end of file diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index 862087e68..d07cb4a2d 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -1,29 +1,29 @@ -
      -
      -
      - 用户头像
      -
      -
      尹教授 TO - 分布式计算环境(课程名称)
      -
      - ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目创建）
      -
      -
      提交（10）
      -
      截止时间：2015-08-20
      -
      -
      （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
      - -
      -
      -
      +
      +
      +
      + 用户头像
      +
      +
      尹教授 TO + 分布式计算环境(课程名称)
      +
      + ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目创建）
      +
      +
      提交（10）
      +
      截止时间：2015-08-20
      +
      +
      （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
      + +
      +
      +
      \ No newline at end of file diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index e6067e860..eb3ff2122 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -1,29 +1,29 @@ -
      -
      -
      - 用户头像
      -
      -
      尹教授 TO - 分布式计算环境(课程名称)
      -
      - ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）
      -
      -
      提交（10）
      -
      截止时间：2015-08-20
      -
      -
      （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
      - -
      -
      -
      +
      +
      +
      + 用户头像
      +
      +
      尹教授 TO + 分布式计算环境(课程名称)
      +
      + ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）
      +
      +
      提交（10）
      +
      截止时间：2015-08-20
      +
      +
      （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
      + +
      +
      +
      \ No newline at end of file diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 34e840b50..5db13a350 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
      -
      +
      <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -83,13 +83,18 @@
        <% activity.journals.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i + 1 %>
      • - <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.user_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
        -
        +
        <% if reply.try(:user).try(:realname) == ' ' %> <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <% else %> @@ -97,7 +102,7 @@ <% end %> <%= format_time(reply.created_on) %>
        -
        +
        <% if reply.details.any? %> <% details_to_strings(reply.details).each do |string| %>

        <%= string %>

        diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 692354f9f..7cf487211 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -1,29 +1,29 @@ -
        -
        -
        - 用户头像
        -
        -
        尹教授 TO - 分布式计算环境(课程名称)
        -
        - ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）
        -
        -
        提交（10）
        -
        截止时间：2015-08-20
        -
        -
        （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
        - -
        -
        -
        +
        +
        +
        + 用户头像
        +
        +
        尹教授 TO + 分布式计算环境(课程名称)
        +
        + ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）
        +
        +
        提交（10）
        +
        截止时间：2015-08-20
        +
        +
        （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
        + +
        +
        +
        \ No newline at end of file diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 1d0a5ce8c..4b83cb906 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
        -
        +
        <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -60,13 +60,18 @@
          <% activity.children.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %>
        • - <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.author_id), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
          -
          +
          <% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% else %> @@ -74,7 +79,7 @@ <% end %> <%= format_time(reply.created_on) %>
          -
          +
          <%= reply.content.html_safe %>
          diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb index a347ffd3a..3ea1479c5 100644 --- a/app/views/users/_project_news.html.erb +++ b/app/views/users/_project_news.html.erb @@ -1,29 +1,29 @@ -
          -
          -
          - 用户头像
          -
          -
          尹教授 TO - 分布式计算环境(课程名称)
          -
          - ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目新闻）
          -
          -
          提交（10）
          -
          截止时间：2015-08-20
          -
          -
          （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
          - -
          -
          -
          +
          +
          +
          + 用户头像
          +
          +
          尹教授 TO + 分布式计算环境(课程名称)
          +
          + ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目新闻）
          +
          +
          提交（10）
          +
          截止时间：2015-08-20
          +
          +
          （作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；
          + +
          +
          +
          \ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index dcb6cd9da..042a62ae2 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -37,27 +37,8 @@ } $(function() { - init_activity_KindEditor_data(<%= user_activity.id%>,null,"87%"); - var description_images=$("div#activity_description_<%= user_activity.id %>").find("img"); - if (description_images.length>0) { - for (var i=0; i").attr("href",image.attr('src')); - image.wrap(element); - } - } - $('#activity_description_<%= user_activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); - - var reply_images=$("div#reply_content_<%= user_activity.id %>").find("img"); - if (reply_images.length>0) { - for (var i=0; i").attr("href",image.attr('src')); - image.wrap(element); - } - } - $('#reply_content_<%= user_activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); - + init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%"); + showNormalImage('activity_description_<%= user_activity.id %>'); }); <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %> diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index 336a62d37..44f992bb4 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -6,7 +6,7 @@ <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
          -
          +
          <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%> TO <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%> @@ -47,7 +47,7 @@
          <%= homework_common.description.html_safe %>
          -
          +
          <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
          diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb index 64b0dff0c..2905e1e7d 100644 --- a/app/views/users/user_system_messages.html.erb +++ b/app/views/users/user_system_messages.html.erb @@ -4,10 +4,10 @@
          - <%= image_tag("/images/logo.png", :width => "42", :height => "42",class: "mt3") %> + <%= image_tag("/images/logo.png", :width => "50", :height => "50") %>
          -
          +
          Trustie平台 发布了系统消息： <%= system_message.subject.nil? ? "系统消息" : system_message.subject %>
          diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index da7434d9b..5f1063f0b 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5127,8 +5127,10 @@ KEditor.prototype = { }; K(window).bind('resize', self._fullscreenResizeHandler); toolbar.select('fullscreen'); - statusbar.first().css('visibility', 'hidden'); - statusbar.last().css('visibility', 'hidden'); + if(statusbar.first() ){ + statusbar.first() .css('visibility', 'hidden'); + statusbar.last().css('visibility', 'hidden'); + } } else { if (_GECKO) { K(window).bind('scroll', function(e) { @@ -5145,7 +5147,9 @@ KEditor.prototype = { } }); } else { - statusbar.first().css('visibility', 'hidden'); + if(statusbar.first() ){ + statusbar.first().css('visibility', 'hidden'); + } } if (self.resizeType === 2) { _drag({ diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 767cefb09..f08a768aa 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -293,8 +293,8 @@ https://github.com/layerssss/paste.js }).call(this); -KindEditor.plugin('paste', function(K) { - var editor = this, +function enablePasteImg(_editor) { + var editor = _editor, name = 'paste'; if(editor.edit == undefined || editor.edit.iframe == undefined){ return; @@ -305,7 +305,7 @@ KindEditor.plugin('paste', function(K) { var nodeBody = contentWindow.document.getElementsByTagName('body')[0]; console.log(nodeBody); $(nodeBody).pastableContenteditable(); - + dataURItoBlob = function(dataURI) { // convert base64/URLEncoded data component to raw binary data held in a string var byteString; @@ -351,5 +351,4 @@ KindEditor.plugin('paste', function(K) { }); return; - -}); +}; diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 8e5e38ee4..4ab267c1a 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -952,3 +952,16 @@ $(document).ready(function () { $("pre").addClass("break_word"); } }); + +//点击图片即显示大图 +function showNormalImage(id) { + var description_images=$('div#'+id).find("img"); + if (description_images.length>0) { + for (var i=0; i").attr("href",image.attr('src')); + image.wrap(element); + } + } + $('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); +} diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index e8ecf897f..8e41df7af 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -83,7 +83,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .mr95{margin-right: 95px;} .ml100{margin-left: 100px;} .mt16{margin-top: 16px;} - +.pr10{padding-right: 10px;} /*课程右侧动态 new_user.css*/ .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} .homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;} @@ -103,9 +103,9 @@ a.homepagePostTypeMine {background:url(../images/homepage_icon.png) -187px -277p a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -189px -308px no-repeat; padding-left:23px;} a.postTypeGrey {color:#888888;} a.postTypeGrey:hover {color:#269ac9;} -.homepagePostBrief {width:710px; margin:0px auto; position:relative;} -.homepagePostPortrait {float:left; width:42px;} -.homepagePostDes {float:left; width:645px; margin-left:15px;} +.homepagePostBrief {width:720px; margin:0px auto; position:relative;} +.homepagePostPortrait {float:left; width:50px;} +.homepagePostDes {float:left; width:655px; margin-left:15px;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;} .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;} @@ -141,7 +141,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} -a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} +a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:33px;} .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;} .homepagePostReplyDes {float:left; width:632px; margin-left:15px;} @@ -172,6 +172,7 @@ a.f_grey:hover {color:#000000;} .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;} .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} @@ -694,9 +695,9 @@ div#menu_r ul {float: left;} div#menu_r ul.menu_r { background: #269ac9; padding:0 10px; height:40px; } div#menu_r li {position: relative; z-index: 9; margin: 0; display: block; float: left; } div#menu_r li:hover>ul { left: -2px;} -div#menu_r a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; } -div#menu_r ul a.parent {background: url(../images/item.png) -20px -30px no-repeat; width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -div#menu_r ul a.parent:hover {background: url(../images/item.png) -20px -60px no-repeat;} +div#menu_r a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } +div#menu_r ul a.parent {background: url(../images/item.png) -30px -30px no-repeat; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +div#menu_r ul a.parent:hover {background: url(../images/item.png) -30px -60px no-repeat;} div#menu_r ul ul a.parent {background: url(../images/item.png) -20px 6px no-repeat;} div#menu_r ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;} /* menu::level1 */ @@ -705,12 +706,13 @@ div#menu_r a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;} div#menu_r li.last { background: none; } /* menu::level2 */ div#menu_r ul ul li { background: none; } -div#menu_r ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #269ac9; margin-top:1px;} +div#menu_r ul ul { position: absolute;top: 38px; left: -999em; min-width: 90px; max-width: 360px; padding: 5px 0 0 0; background:#fff;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top:1px;} div#menu_r ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#269ac9;} div#menu_r ul ul a:hover { background:#297fb8; color:#fff;} div#menu_r ul ul li.last { margin-left:15px; } div#menu_r ul ul li {width: 100%;} +.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} /* 20150414*/ a.wzan_img{background:url(../images/new_project/public_icon.png) 0px -457px no-repeat; display:block; height:31px; width:30px; color:#fff; } a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px no-repeat;} @@ -887,12 +889,7 @@ a:hover.about_me{ color:#0781b4;} } #homework_work_test_show{margin-left: 35px;width: 94%;} - - - - /*20150820课程作业 LB*/ -.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {width:708px; height:34px; border-bottom:1px solid #e9e9e9;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; color:#269ac9; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} @@ -916,7 +913,7 @@ a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;} .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;} /*20150820课程作业 LB*/ -.HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;} +.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float: right;} .RightBanner {font-size:16px; width:733px; color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} @@ -1039,8 +1036,6 @@ a:hover.c_grey{ color:#333;} .link_file_box{ width:360px;} /*a.postOptionLink{float: right;color: #64bdd9;display: block;padding: 1px 5px;border: 1px solid #64bdd9;width: initial;}*/ /*a:hover.postOptionLink {color: #fff;background: #64bdd9;}*/ -a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} -a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} /*讨论区内部样式*/ .postDetailContainer {padding:15px; border:1px solid #dddddd; background-color:#ffffff;} @@ -1076,4 +1071,4 @@ a.postRouteLink {font-weight:bold; color:#484848;} a.postRouteLink:hover {text-decoration:underline;} .ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;} -.ReplyToMessageInputContainer {width:582px; float:left;} \ No newline at end of file +.ReplyToMessageInputContainer {width:582px; float:left;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 75ffd716c..872d8df6d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -297,6 +297,7 @@ a:hover.bgreen_n_btn{background:#08a384;} .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;} .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} /* commonpic */ .pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; } @@ -637,9 +638,9 @@ a.homepageTypeUMessage {background:url(../images/homepage_icon.png) -4px -519px a.homepageTypeUApply {background:url(../images/homepage_icon.png) -91px -582px no-repeat; padding-left:23px;} a.postTypeGrey {color:#888888;} a.postTypeGrey:hover {color:#269ac9;} -.homepagePostBrief {width:710px; margin:0px auto; position:relative;} -.homepagePostPortrait {float:left; width:42px;} -.homepagePostDes {float:left; width:645px; margin-left:15px; overflow:hidden;} +.homepagePostBrief {width:720px; margin:0px auto; position:relative;} +.homepagePostPortrait {float:left; width:50px;} +.homepagePostDes {float:left; width:655px; margin-left:15px; overflow:hidden;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;} .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;} @@ -648,15 +649,15 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostIntro {font-size:14px; color:#484848;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;} .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;} -.homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} -.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} +.homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} +.homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} .topBorder {border-top: 1px solid #e4e4e4;} div.minHeight48{min-height: 48px;} .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:15px;} .homepagePostReplyBannerTime{width:85px; display:inline-block;} -.homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;} -.homepagePostReplyInputContainer {width:630px; float:left;} +.homepagePostReplyBannerMore{width:315px; display:inline-block; text-align:right; float:right; padding-right:15px;} +.homepagePostReplyInputContainer {width:642px; float:left;} .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;} .homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;} .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;} @@ -668,7 +669,7 @@ a.postReplyCancel {color:#888888; display:block;} a.postReplyCancel:hover {color:#ffffff;} .homepagePostReplyInputContainer2 {width:595px; margin:0px auto;} .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;} -.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;} +.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:690px; margin:0px auto; margin-top:15px; min-height:50px;} .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;} .homepagePostSetting ul li:hover ul {display:block;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} @@ -678,7 +679,7 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:33px;} .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;} -.homepagePostReplyDes {float:left; width:632px; margin-left:15px;} +.homepagePostReplyDes {float:left; width:642px; margin-left:15px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} @@ -1001,7 +1002,6 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .uppic_btn:hover {background-color: #329cbd;} /*20150820课程作业 LB*/ -.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {width:708px; height:34px; border-bottom:1px solid #e9e9e9;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; color:#269ac9; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} @@ -1024,7 +1024,7 @@ a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;} .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;} /*20150820课程作业 LB*/ -.HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;} +.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {font-size:16px; width:733px; color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 476ccefde..45580e95e 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -528,8 +528,8 @@ a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -2 a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -10px -360px no-repeat; padding-left:23px;} a.postTypeGrey {color:#888888;} a.postTypeGrey:hover {color:#269ac9;} -.homepagePostBrief {width:710px; margin:20px auto 0px auto; position:relative;} -.homepagePostPortrait {float:left; width:90px;} +.homepagePostBrief {width:720px; margin:20px auto 0px auto; position:relative;} +.homepagePostPortrait {float:left; width:50px;} .homepagePostDes {float:left; width:600px; margin-left:20px;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:8px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:10px; font-weight:bold;}