diff --git a/app/assets/images/learning-object-preview-large.png b/app/assets/images/learning-object-preview-large.png new file mode 100644 index 0000000000000000000000000000000000000000..bbfb4087443833a867e3257ad5e6e3bee5492d64 Binary files /dev/null and b/app/assets/images/learning-object-preview-large.png differ diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss index a6fb67e1a6ecd30625322f9ab5d4ebd8c8154214..63efc2f8113c7089d684053c26db5095c6127d95 100644 --- a/app/assets/stylesheets/application/learning_objects.scss +++ b/app/assets/stylesheets/application/learning_objects.scss @@ -80,13 +80,15 @@ $background-grey: #e7e7e8; .actions { text-align: center; - color: #F05421; - font-weight: 400; .action { margin-top: 10px; padding: 0; + a { + color: #F05421; + font-weight: 400; + } img { width: 40px; height: 40px; diff --git a/app/helpers/learning_objects_helper.rb b/app/helpers/learning_objects_helper.rb index eea95b9a4caf2e8ee370140c660411b841d9cf4b..f00dee04bb370862ea9807f7bcf7963c6b40a937 100644 --- a/app/helpers/learning_objects_helper.rb +++ b/app/helpers/learning_objects_helper.rb @@ -4,9 +4,13 @@ module LearningObjectsHelper categories.to_s end - def learning_object_thumbnail(learning_object) - if learning_object.thumbnail == "thumbnai" - image_tag('learning-object-preview.png') + def learning_object_thumbnail(learning_object, size = "") + if learning_object.thumbnail.nil? + if size == "large" + image_tag('learning-object-preview-large.png') + else + image_tag('learning-object-preview.png') + end else image_tag learning_object.thumbnail, alt: learning_object_title(learning_object) end diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb index b28f497a28be4e68517e93f9ae4d0448bbcbbdd8..70cb8ccf6231ac51aa197ef0ccb77b54d337c7ba 100644 --- a/app/models/learning_object.rb +++ b/app/models/learning_object.rb @@ -52,6 +52,14 @@ class LearningObject end end + def get_retrievelink + get_bitstream_retrievelink_of "ORIGINAL" + end + + def get_filename + get_bitstream_filename_of "ORIGINAL" + end + private def defaults diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb index efb4720e63e728d46db928602f74678594d438a2..25c0ccd0ff7389b27b2914f1277eca24db9c5b0a 100644 --- a/app/views/learning_objects/show.html.erb +++ b/app/views/learning_objects/show.html.erb @@ -25,13 +25,7 @@ <div class="row learning-object"> <div class="col-md-7"> - <%= - if (@learning_object.thumbnail == "thumbnai") - image_tag 'learning-object-preview-large.png', class: "thumbnail" - else - image_tag @learning_object.thumbnail, class: "thumbnail" - end - %> + <%= learning_object_thumbnail @learning_object, "large" %> <div class="stats"> <span class="glyphicon glyphicon-eye-open"><%= @learning_object.views %> </span> <span class="glyphicon glyphicon-star"><%= @learning_object.likes %> </span> @@ -74,8 +68,10 @@ </div> <div class="actions"> <div class="col-md-3 action"> - <%= image_tag "icons/download.png", alt: "Download do objeto" %> - <h6>salvar no computador</h6> + <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" %>