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

# Conflicts:
#	app/views/libraries/index.html.erb

app/views/libraries/index.html.erb

@@ -6,16 +6,16 @@
       <%= link_to '发布案例', new_library_path, class: 'white-btn edu-filter-btn-blue fr mr10 mt8', style: 'color: #4CACFF' %>
     </p>
     <div class="clearfix pl30 pr30">
-      <% if User.current.try(:logged?) %>
+      <ul class="fl library_nav mt20">
-        <ul class="fl library_nav mt20">
+        <li class="<%= params[:type] == 'mine' ? '' : 'active' %>">
-          <li class="<%= params[:type] == 'mine' ? '' : 'active' %>">
+          <%= link_to '全部', libraries_path(search: params[:search]), remote: true %>
-            <%= link_to '全部', libraries_path(search: params[:search]), remote: true %>
+        </li>
-          </li>
+        <% if User.current.try(:logged?) %>
           <li class="<%= params[:type] == 'mine' ? 'active' : '' %>">
             <%= link_to '我的', libraries_path(search: params[:search], type: 'mine'), remote: true %>
           </li>
-        </ul>
+        <% end %>
-      <% end %>
+      </ul>
       <div class="edu-position fr mt12 mb10">
         <%= hidden_field_tag(:type, params[:type]) %>
         <input class="winput-300-35 panel-box-sizing" placeholder="输入教学案例标题、编号进行检索" type="text" id="search_name">