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

app/views/homework_attach/new.html.erb

@@ -28,7 +28,7 @@
       </p>
       <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
         <strong>提交项目&nbsp;&nbsp;：</strong>
-        <%= f.select :project_id, options_for_select(user_projects_option),:name => "project_id", :required => true, :style => "width:490px;"%>
+        <%= f.select :project_id,options_for_select(user_projects_option), {},{:style => "width:490px;"}  %>
         <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
         <p class="font_lighter" style="padding-left:120px;clear:left;">提交项目可以为空</p>
       </p>

app/views/welcome/index.html.erb

@@ -143,7 +143,7 @@
 
 <div class="right" style="float: right; width: 48%; "> 
 	<ul class="welcome-message-list">
-      <!--<% cache 'forum_links' do %> -->
+      <!--<%# cache 'forum_links' do %> -->
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
 		  <h3 style="color: rgb(21, 188, 207);">
 			<strong>贴吧动态</strong>
@@ -151,11 +151,11 @@
 			<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
 			<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 		</div>
-          <!--<%end %> -->
+          <!--<%#end %> -->
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(7) %>
 		<% topics.includes(:forum, :last_reply, :author).each do |topic|%>
-              <!--<% cache cache_key_for_topic(topic) do %> -->
+              <!--<%# cache cache_key_for_topic(topic) do %> -->
 			<li class="message-brief-intro">
 				<div class='memo_title text_nowrap'>
 					<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
@@ -175,7 +175,7 @@
 					</span>
 				</div>
 			</li>
-                  <!--<%end %> --> <!-- cache -->
+                  <!--<%#end %> --> <!-- cache -->
 		<% end %>
 		</div>
 	</ul>