Merge remote-tracking branch 'origin/szzh' into szzh

app/views/boards/_course_new.html.erb

@@ -4,17 +4,19 @@
   <div id="new_course_topic">
     <div class="homepagePostBrief c_grey">
       <div>
-        <input  type="text" name="message[subject]" id="message_subject" class="InputBox  w704" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布帖子，请先输入帖子标题" value="<%= topic.subject%>" >
+        <input  type="text" name="message[subject]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布帖子，请先输入帖子标题" value="<%= topic.subject%>" >
         <p id="subjectmsg"></p>
       </div>
       <div id="topic_editor" style="display: none;">
-        <div class="mt10">
+        <%if User.current.member_of_course?(course)%>
+            <div class="mt10">
           <%= f.check_box :sticky, :value => topic.sticky%>
           <%= label_tag 'message_sticky', l(:label_board_sticky) %>
           <%= f.check_box :locked, :value => topic.locked%>
           <%= label_tag 'message_locked', l(:label_board_locked) %>
           <div class="cl"></div>
         </div>
+        <% end %>
         <div class="mt10">
           <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
           <%= text_area :quote,:quote,:style => 'display:none' %>

app/views/boards/_course_show.html.erb

@@ -41,7 +41,7 @@
   <% if User.current.logged? %>
     <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},
                           :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
-        <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false} %>
+        <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => course} %>
     <% end %>
   <% end %>
 

public/stylesheets/courses.css

@@ -902,7 +902,7 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;}
 .w720{width:721px;}
 .w709{width: 709px;}
 .w701{width: 701px;}
-.w704{width: 704px;}
+.w713{width: 713px;}
 a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; 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;}
 a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}