Merge branch 'newb'

app/views/collections/_collection.html.erb

 <%= link_to collection_path(id: collection.id) do %>
           <div class="col-sm-4">
         <div>
-          <%= image_tag 'icons/collection', width: 250,height:150 %>
+          <%= image_tag 'icons/collection', width: 210,height:140 %>
         </div>
         <div class="panel-body">
           <h4 class="media-heading"><%= collection.name %></h4>
-          <span class="glyphicon glyphicon-eye-open">200&nbsp;</span>
-          <span class="glyphicon glyphicon-star">4,5&nbsp;</span>
-          <span>Por <a>Usuário&nbsp;</a></span>
+        <!--  <span class="glyphicon glyphicon-eye-open">200&nbsp;</span>
+          <span class="glyphicon glyphicon-star">4,5&nbsp;</span> -->
+          <span><a><%= 'Por '+ collection.owner.name unless collection.owner.name.blank? %>&nbsp;</a></span>
         </div>
       </div>
 <% end %>

app/views/learning_objects/show.html.erb

@@ -59,26 +59,30 @@
         </div>
       </div>
       <div class="rating-panel">
-        <div class="actions">
-          <div class="col-md-3 action">
-            <%= image_tag "icons/Curtir_01.png", alt: "Curtir" %>
-            <h6>curtir objeto</h6>
-          </div>
-          <div class="col-md-3 action">
-            <a href="<%= @learning_object.get_retrievelink %>">
-              <%= image_tag "icons/download.png", alt: "Download do objeto" %>
-              <h6>salvar no computador</h6>
-            </a>
-          </div>
-          <div class="col-md-3 action">
-            <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %>
-            <h6>adicionar à coleção</h6>
-          </div>
-          <div class="col-md-3 action">
-            <%= render "complaints/complaints_button" %>
-            <h6>denunciar objeto</h6>
+        <% if user_signed_in? %>
+          <div class="actions">
+            <div class="col-md-3 action">
+              <%= image_tag "icons/Curtir_01.png", alt: "Curtir" %>
+              <h6>curtir objeto</h6>
+            </div>
+            <div class="col-md-3 action">
+              <a href="<%= @learning_object.get_retrievelink %>">
+                <%= image_tag "icons/download.png", alt: "Download do objeto" %>
+                <h6>salvar no computador</h6>
+              </a>
+            </div>
+            <div class="col-md-3 action">
+              <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %>
+              <h6>adicionar à coleção</h6>
+            </div>
+            <div class="col-md-3 action">
+              <%= render "complaints/complaints_button" %>
+              <h6>denunciar objeto</h6>
+            </div>
           </div>
-        </div>
+        <% else %>
+          <h4>Logue-se para poder curtir, adicionar à coleção, salvar ou denunciar.</h4>
+        <% end %>
       </div>
     </div>
   </div>
@@ -151,11 +155,6 @@
           <% end %>
         </table>
         <br/>
-        <% if user_signed_in? %>
-        <%= link_to "Curtir",
-                              like_learning_object_path(@learning_object.id_dspace),
-                              method: :post, remote: true %>
-        <% end %>
   <!--      <br/>
          <div class="row">
           <div class="col-md-12">

app/views/shared/application/_header.html.erb

@@ -56,7 +56,7 @@
                 </div>
                 <div class="media-right">
                   <a href="#">
-                    <%=link_to( image_tag(current_user.avatar.url(:thumb),alt: "Foto do usuário"),me_users_path, :class=>"user-image") %>
+                    <%=link_to( image_tag(current_user.avatar.url(:thumb), :class=>"user-image", alt: "Foto do usuário"),me_users_path) %>
                   </a>
                 </div>
               </div>