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

app/controllers/comments_controller.rb

@@ -50,11 +50,15 @@ class CommentsController < ApplicationController
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
       course_activity = CourseActivity.where("course_act_type='News' and course_act_id =#{@news.id}").first
-      course_activity.updated_at = Time.now
-      course_activity.save
+      if course_activity
+        course_activity.updated_at = Time.now
+        course_activity.save
+      end
       user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first
-      user_activity.updated_at = Time.now
-      user_activity.save
+      if user_activity
+        user_activity.updated_at = Time.now
+        user_activity.save
+      end
     end
 
     if params[:user_activity_id]

app/controllers/messages_controller.rb

@@ -163,11 +163,15 @@ class MessagesController < ApplicationController
     # @reply.reply_id = params[:id]
     @topic.children << @reply
     course_activity = CourseActivity.where("course_act_type='Message' and course_act_id =#{@topic.id}").first
-    course_activity.updated_at = Time.now
-    course_activity.save
+    if course_activity
+      course_activity.updated_at = Time.now
+      course_activity.save
+    end
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
-    user_activity.updated_at = Time.now
-    user_activity.save
+    if user_activity
+      user_activity.updated_at = Time.now
+      user_activity.save
+    end
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/student_work_controller.rb

@@ -174,11 +174,15 @@ class StudentWorkController < ApplicationController
 
       if student_work.save
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
-        course_activity.updated_at = Time.now
-        course_activity.save
+        if course_activity
+          course_activity.updated_at = Time.now
+          course_activity.save
+        end
         user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first
-        user_activity.updated_at = Time.now
-        user_activity.save
+        if user_activity
+          user_activity.updated_at = Time.now
+          user_activity.save
+        end
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)

app/controllers/words_controller.rb

@@ -55,12 +55,16 @@ class WordsController < ApplicationController
     @jfm = add_reply_adapter options
     @save_succ = true if @jfm.errors.empty?
     if @save_succ
-    course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
-    course_activity.updated_at = Time.now
-    course_activity.save
-    user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
-    user_activity.updated_at = Time.now
-    user_activity.save
+      course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
+      if course_activity
+        course_activity.updated_at = Time.now
+        course_activity.save
+      end
+      user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
+      if user_activity
+        user_activity.updated_at = Time.now
+        user_activity.save
+      end
     end
     respond_to do |format|
       # format.html {

app/views/layouts/base_forums.html.erb

@@ -143,6 +143,9 @@
     <div class="cl"></div>
     <div class="homepageContentContainer">
       <div class="homepageContent">
+        <div class="postRouteContainer mb10">
+          »&nbsp;<a href="<%= forums_path%>" class="postRouteLink">贴吧</a>&nbsp;»&nbsp;<a href="<%= forum_path(@forum)%>" class="postRouteLink"><%= @forum.name%></a>&nbsp;<%if @memo %> »&nbsp;<font class="fontGrey2"><%= @memo.subject%></font><% end %>
+        </div>
         <div class="homepageLeft">
           <div class="postDetailContainer">
             <div class="fl mr10 pr"> <%= link_to image_tag(url_to_avatar(@forum.creator),:width=>75,:height => 75,:alt=>'贴吧图像' ),user_path( @forum.creator) %>

app/views/memos/_praise_tread.html.erb

@@ -2,7 +2,7 @@
    <% if User.current.logged? %>
     <% if horizontal %>
         <!-- 横排 -->
-        <div id="praise_tread_<%= obj.id %>" style="float:right;">
+        <div id="praise_tread_<%= obj.id %>" style="float:right; " >
           <% @is_valuate = is_praise_or_tread(obj,user_id)%>
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>

app/views/memos/show.html.erb

@@ -58,12 +58,14 @@
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a>
+        <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+        <div class="cl"></div>
+      </div>
+
       <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
-       <span id="praise_tread" style="float: right">
-    <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-  </span>
       <div class="cl"></div>
       <div class="memo-content" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>

app/views/repositories/show.html.erb

@@ -29,79 +29,6 @@
     </p>
   </div>
 </div>
-<!--<div class="repos_more"><a href="#" id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">展开Git操作指南</a></div>-->
-<!--<div id="repos_git_more">-->
-  <!--<br>-->
-  <!--<div class=" c_dark f14">-->
-    <!--<p color="red">git 克隆和提交的用户名和密码为登录用户名和密码 </p>-->
-    <!--<p>项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码。</p>-->
-    <!--<p>通过cmd命令提示符进入代码对应文件夹的根目录，-->
-      <!--如果是首次提交代码，执行如下命令：</p>-->
-  <!--</div>-->
-  <!--<div class="repos_explain">-->
-    <!--<p>git init</p>-->
-
-    <!--<p>git add *</p>-->
-
-    <!--<p>git commit -m "first commit"</p>-->
-
-    <!--<p>git remote add origin-->
-    <!--<%#= @repos_url %>-->
-    <!--</p>-->
-
-    <!--<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>-->
-
-    <!--<p>git push -u origin master</p>-->
-  <!--</div>-->
-  <!--&lt;!&ndash;repos_explain end&ndash;&gt;-->
-  <!--<div class="c_dark f14">-->
-    <!--<p>已经有本地库，还没有配置远程地址，打开命令行执行如下：</p>-->
-  <!--</div>-->
-  <!--<div class="repos_explain">-->
-    <!--<p>git remote add origin <%#= @repos_url %></p>-->
-
-    <!--<p>git add .</p>-->
-
-    <!--<p>git commit -m "first commit"</p>-->
-
-    <!--<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>-->
-
-    <!--<p>git push -u origin master</p>-->
-  <!--</div>-->
-  <!--&lt;!&ndash;repos_explain end&ndash;&gt;-->
-  <!--<div class="c_dark f14">-->
-    <!--<p>已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：</p>-->
-  <!--</div>-->
-  <!--<div class="repos_explain">-->
-    <!--<p>git clone <%#= @repos_url %></p>-->
-
-    <!--<p>git push</p>-->
-
-    <!--<p>git checkout -b branch_name</p>-->
-
-    <!--<p>git push origin branch_name</p>-->
-  <!--</div>-->
-  <!--&lt;!&ndash;repos_explain end&ndash;&gt;-->
-  <!--<div class="c_dark f14">-->
-    <!--<p>从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：</p>-->
-  <!--</div>-->
-  <!--<div class="repos_explain">-->
-    <!--<p>git remote add trustie-->
-    <!--<%#= @repos_url %>-->
-    <!--</p>-->
-
-    <!--<p>git add .</p>-->
-
-    <!--<p>git commit -m "first commit"</p>-->
-
-    <!--<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>-->
-
-    <!--<p>git push -u trustie branch:branch</p>-->
-
-    <!--<p><a href="/users/646" class="c_orange">李海</a>提供</p>-->
-  <!--</div>-->
-<!--</div>-->
-<!-- 代码库显示 -->
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
     <%= render :partial => 'dir_list' %>
 <% end %>

app/views/users/_course_homework.html.erb

@@ -46,28 +46,28 @@
       <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <%= activity.description.html_safe %>
       </div>
-      <% if is_teacher%>
-          <div class="homepagePostSetting">
+      <%# if is_teacher%>
+          <!--<div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+                    <%#= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
                   </li>
                   <li>
-                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                    <%#= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                    <%#= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
                   </li>
                   <li>
-                    <%= homework_anonymous_comment activity %>
+                    <%#= homework_anonymous_comment activity %>
                   </li>
                 </ul>
               </li>
             </ul>
           </div>
-      <% end%>
+      <%# end%>-->
       </div>
     <div class="cl"></div>
   </div>

public/stylesheets/new_user.css

@@ -318,12 +318,16 @@ a:hover.search_btn{ background: #0fa9bb;}
 
 /*资源库*/
 .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
+/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
 .resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
 .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
 .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
 .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
+/*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/
+/*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
+/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#269ac9;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
@@ -335,13 +339,21 @@ a.uploadText {color:#ffffff; font-size:14px;}
 .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
 .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
 .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
+/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
 .resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
+/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
 .resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
+/*.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
 .resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;}
 .resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
+/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
 a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
@@ -350,6 +362,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
 .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
 .resourcesSelectSend {float:right;}
+/*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;}
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
@@ -447,7 +460,7 @@ input.sendSourceText:hover {background-color:#297fb8;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden;}
-.popbox{position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
+.popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px;  /* background:#fff; */ -moz-border-radius:5px;  /* -webkit-border-radius:5px; */  /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */  /* overflow:auto; */}
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 .uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
@@ -689,7 +702,7 @@ ul.list_watch{
 .w450{width: 450px;}
 
 /*引用资源库弹窗*/
-.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:16px !important; padding-right:16px !important; padding-bottom:16px !important; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
+.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
 .referenceText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight:bold;}
 .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchReferencePopup {border:none; outline:none; background-color:#ffffff; width:190px; height:32px; padding-left:10px; display:inline-block; float:left;}
@@ -748,7 +761,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
 .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
 .postDetailWrap {width:580px; float:left;}
-.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
+.postDetailTitle {width:650px; max-width:650px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
@@ -760,7 +773,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no
 .postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;}
 .postThemeContainer {width:720px;}
 .postThemeWrap {width:655px; float:left;position: relative}
-.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px;}
+.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-right:30px; margin-top:3px;}
 .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
 a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
@@ -768,6 +781,9 @@ a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repe
 .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;}
 .pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;}
 .homepagePostReplyInput {width:543px; height:33px; max-width:543px; max-height:33px; border:1px solid #d9d9d9; outline:none;}
+.postRouteContainer {padding:10px 15px; background-color:#ffffff; border:1px solid #dddddd; margin-top:10px; font-size:14px;}
+a.postRouteLink {font-weight:bold; color:#484848;}
+a.postRouteLink:hover {text-decoration:underline;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}