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

Conflicts:
	public/stylesheets/courses.css

app/controllers/tags_controller.rb

@@ -248,6 +248,8 @@ class TagsController < ApplicationController
         @obj = OpenSourceProject.find_by_id(@obj_id)
       when '9'
         @obj = Course.find_by_id(@obj_id)
+      when '10'
+        @obj = Attachment.find_by_id(@obj_id)
       else
         @obj = nil
     end

app/views/courses/_courses_jours.html.erb

@@ -12,10 +12,10 @@
   <% else %>
         <%= form_for('new_form', :method => :post,
                      :url => {:controller => 'words', :action => 'leave_course_message'}) do |f|%>
-            <%= f.text_area 'course_message',:id => "leave_meassge", :rows => 3, :cols => 65,
+            <%= f.text_area 'course_message',:id => "leave_meassge",
                             :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250%>
-            <a href="#">取&nbsp;&nbsp;消</a>
+            <a href="#" class="grey_btn fr ml10">取&nbsp;&nbsp;消</a>
-            <a href="#"  onclick='$("#leave_meassge").parent().submit();'> <%= l(:button_leave_meassge)%></a>
+            <a href="#"  onclick='$("#leave_meassge").parent().submit();' class="blue_btn fr"> <%= l(:button_leave_meassge)%></a>
         <% end %>
   <% end %>
 </div>

app/views/courses/_history.html.erb

@@ -3,17 +3,15 @@
         <% for journal in journals %>
             <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
               <div class="ping_dispic">
-                <a target="_blank" href="#">
+                  <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
-                  <%= image_tag(url_to_avatar(journal.user),:width => '46',:height => '46')  %>
-                </a>
               </div>
               <div class="ping_discon" style="width: 610px;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%>
+                    <%= link_to journal.user, user_path(journal.user),:class => 'c_blue fb fl mb10', :target => "_blank"%>
                   </span>
-                  <span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">
+                  <span class="c_grey fr">
                     <%= format_time(journal.created_on) %>
                   </span>
                   <div class="cl"></div>

app/views/courses/feedback.html.erb

@@ -1,9 +1,10 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <!-- <#%= stylesheet_link_tag  'css', :media => 'all' %> -->
 <div class="project_r_h">
-  <h2 class="project_h2">用户留言</h2>
+  <h2 class="project_h2"><%= l(:label_contest_userresponse) %></h2>
 </div>
 
+
 <%= render :partial => 'courses_jours',
            :locals => { :contest => @contest, :journals => @jour, :state => false}
 %>
@@ -12,7 +13,7 @@
 <script>
 var W3CDOM = document.createElement && document.getElementsByTagName;
 
-window.onload = setMaxLength;
+//window.onload = setMaxLength;
 
 function setMaxLength() {
     if (!W3CDOM) return;

app/views/files/_course_list.html.erb

@@ -44,8 +44,8 @@
       </div>
       <div class="cl"></div>
       <div class="tag_h">
-        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "10"} %>
-        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "10"} %>
       </div>
       <div class="cl"></div>
     </div><!---re_con_box end-->

app/views/files/_upload_show.html.erb

@@ -1,5 +1,5 @@
 
-  <div id="popbox_upload" class="box_h3 mb10">
+  <div id="popbox_upload" class="box_h3 mb10" style="margin-top: -30px">
   <div class="upload_con">
     <h2><%= l(:label_upload_files)%></h2>
     <div class="upload_box">

app/views/news/_course_news.html.erb

@@ -20,23 +20,23 @@
 </div>
 
 
-<% if @course && User.current.allowed_to?(:manage_news, @course) %>
+<!-- <%# if @course && User.current.allowed_to?(:manage_news, @course) %>
-    <%= link_to(btn_tips, new_course_news_path(@course),
+    <%#= link_to(btn_tips, new_course_news_path(@course),
                 :class => 'icon icon-add',
                 :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
 
     <div id="add-news" class="add_frame" style="display:none;">
-      <%= labelled_form_for @news, :url => course_news_index_path(@course),
+      <%#= labelled_form_for @news, :url => course_news_index_path(@course),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>
-          <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
+          <%#= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
-          <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
+          <%#= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
           <%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
 
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
+          <%#= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
-      <% end if @course %>
+      <%# end if @course %>
       <div id="preview" class="wiki"></div>
     </div>
-<% end %>
+<%# end %>-->
 
 <div>
   <% if @newss.empty? %>
@@ -51,8 +51,8 @@
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
               <span class="fl"> <%= l(:label_release_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %><br />
               <div class="cl mb5"></div>
-              <div  id="news_description_<%= news.id %>" class="news_description mt5"><%= textilizable(news, :description) %><br /> <%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></div>
+              <p  id="news_description_<%= news.id %>" class="news_description mt5"><%= news.description %><br /> <%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></p>
-              <div class="news_foot" onclick="news_show_more_des(<%= news.id %>);"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
+              <div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
             </div>
             <div class="cl"></div>
           </div><!--problem_main end-->
@@ -90,4 +90,13 @@
             });
         });
     });
+    $(function(){
+        $('.news_description').each(function () {
+            if($(this).height() >= 38)
+            {
+                $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block");
+            }
+          }
+        )
+    });
 </script>

app/views/tags/_course_attachment_tag_name.erb

@@ -0,0 +1,56 @@
+<script type="text/javascript">
+    // $(this).ready(function(){
+    // $('.tag_show').hover(function() {
+    // $(this).children("span").show();
+    // }, function() {
+    // $(this).children("span").hide();
+    // });
+    // })
+</script>
+<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求 7代表竞赛 9代表课程-->
+<% @tags = obj.reload.tag_list %>
+<% if non_list_all and (@tags.size > 0) %>
+    <!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替  -->
+    <% if @tags.size > Setting.show_tags_length.to_i then %>
+        <% i = 0 %>
+        <% until i>Setting.show_tags_length.to_i do %>
+            <div id="tag">
+              <%= link_to @tags[i], :controller => "tags", :action => "index", :q => @tags[i], :object_flag => object_flag, :obj_id => obj.id %>
+            </div>
+            <% i += 1 %>
+        <% end %>
+        <%= more_tags(obj.id,object_flag)%>
+    <% else %>
+        <% @tags.each do |tag| %>
+            <div id="tag">
+              <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
+            </div>
+        <% end %>
+    <% end %>
+<% else %>
+    <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
+    <% if @tags.size > 0 %>
+        <% @tags.each do |tag| %>
+            <div id="tag">
+                <span class="re_tag f_l">
+                  <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
+                  <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
+                  <% case object_flag %>
+                    <% when '10' %>
+                        <%# if (User.current.logged? &&
+                                User.current.admin?
+                        # && (@project && User.current.member_of?(@project))
+                        )
+                        %>
+                      <% if obj.author_id == User.current.id || User.current.admin?%>
+                        <span class='del'>
+                          <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
+                                      :taggable_id => obj.id, :taggable_type => object_flag %>
+                        </span>
+                      <% end %>
+                    <% end %>
+                </span>
+            </div>
+        <% end %>
+    <% end %>
+<% end %>

app/views/tags/_tag_list.html.erb

@@ -5,7 +5,12 @@
 	<span class="re_tag f_l"> <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
-	    <% when '6' %>
+	    <% when '10' %>
+          <% if obj.author_id == User.current.id || User.current.admin?%>
+		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag_new", :remote => true, :tag_name => tag,
+                                               :taggable_id => obj.id, :taggable_type => object_flag %> </span>
+			<% end %>
+          <% when '6' %>
           <% if obj.author_id == User.current.id || User.current.admin?%>
 		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag_new", :remote => true, :tag_name => tag,
                                                :taggable_id => obj.id, :taggable_type => object_flag %> </span>

app/views/tags/_tag_new.html.erb

@@ -12,6 +12,13 @@
   <!--  3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
   <% if object_flag == '3' %>
 
+  <% elsif object_flag == '10' %>
+      <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
+        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag} %>
+      </div>
+      <div id="put-tag-form-<%=obj.class%>-<%=obj.id%>" style="display: none;height: 100px;">
+        <%= render :partial => "courses/course_resources_html", :locals => {:obj => obj ,:object_flag => object_flag } %>
+      </div>
   <% elsif object_flag == '6' %>
       <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
         <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag} %>

app/views/tags/tag_save.js.erb

@@ -14,6 +14,12 @@ $("#put-tag-form-<%=@obj.class%>-<%=@obj.id%> #name").val("");
     $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
     $('#tags_name').val("");
+<% elsif @obj_flag == '10'%>
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+//$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide();
+$("#tags_name_<%=@obj.id%>").val("");
 <% else%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                         :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');

app/views/words/_journal_reply_items.html.erb

@@ -22,15 +22,12 @@
         <% end %>
 
         <p>
-		    <span class="message-notes">
+          <%= reply.notes %>
-              <%= reply.notes %>
-            </span>
         </p>
-        <p>
+            <span class="c_grey fl">
-            <span class="time">
               <%= format_time reply.created_on %>
             </span>
-            <span class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
+            <div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
                 <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
                   <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
@@ -39,18 +36,18 @@
                          <%= link_to l(:button_reply),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
-            </span>
+            </div>
-        </p>
+        <div class="cl"></div>
+        <div id='<%=id%>' class="respond-form">
+          <% if reply_allow %>
+              <% if journal.jour_type == "Course" %>
+                  <%= render :partial => "words/new_respond_course", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
+              <% else %>
+                  <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
+              <% end %>
+          <% end %>
+        </div>
       </div>
-      <div id='<%=id%>' class="respond-form">
+      <div class="cl"></div>
-        <% if reply_allow %>
-            <% if journal.jour_type == "Course" %>
-                <%= render :partial => "words/new_respond_course", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
-            <% else %>
-                <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
-            <% end %>
-        <% end %>
-      </div>
-      <div style="clear: both;"></div>
     </div>
 <% end %>

app/views/words/_new_respond_course.html.erb

@@ -1,15 +1,15 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
-    <%= text_area_tag 'user_notes', "", :class => 're_respond-form',
+    <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
-                      :style => "resize: none;", :rows => 4,
+
                       :placeholder => l(:label_feedback_respond_content),
-                      :width => '100%',
+
                       :maxlength => 250 %>
     <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
     <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
+
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
-                   :class => "sub_btn",
+                   :class => "reply_btn"%>
-                   :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
 
 <% end %>

public/stylesheets/courses.css

@@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
 .problem_p span{ color:#ff3e00;}
 a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
 a:hover.problem_pic{border:1px solid #64bdd9;}
-.problem_txt{ width:610px; margin-left:10px; color:#777777;}
+.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
 a.problem_name{ color:#ff5722;}
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
@@ -177,7 +177,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
 /*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px;  }*/
-.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}
+/*.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}*/
 
 
 /****评分弹框****/
@@ -340,6 +340,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
 .r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
 blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
+.respond-form{display: none;margin: auto;clear: both;}
 
 #attachments_fields input.description {margin-left: 4px;width: 100px;}
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
@@ -350,6 +351,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
 #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
 #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+.reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
+.reply_btn:hover{ background:#999; color:#fff; }
 
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 .ui-widget {