From ea7fdd13e7bb6aa5be354f73f82c9e91357ef98f Mon Sep 17 00:00:00 2001 From: Mateus Rambo Strey <mars11@inf.ufpr.br> Date: Mon, 28 Sep 2015 19:17:13 -0300 Subject: [PATCH] add default image to learning object --- app/assets/images/learning-object-preview.png | Bin 0 -> 3711 bytes .../application/learning_objects.scss | 7 +++---- .../_learning_object_horizontal.erb | 12 ++++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 app/assets/images/learning-object-preview.png diff --git a/app/assets/images/learning-object-preview.png b/app/assets/images/learning-object-preview.png new file mode 100644 index 0000000000000000000000000000000000000000..4b52e2eb2c0448bbbc602e0d4d7e42ba7909bd94 GIT binary patch literal 3711 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 KST>sbr2P-_%ohd# literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss index a6f41d91f..3fba1f7f1 100644 --- a/app/assets/stylesheets/application/learning_objects.scss +++ b/app/assets/stylesheets/application/learning_objects.scss @@ -13,8 +13,8 @@ } .learning-object-thumbnail { - width: 250px; - height: 150px; + min-width: 250px; + height: 141px; position: relative; .learning-object-actions { @@ -23,5 +23,4 @@ right: 5px; } } - -} \ No newline at end of file +} diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb index d8b8c42b6..da7846d43 100644 --- a/app/views/learning_objects/_learning_object_horizontal.erb +++ b/app/views/learning_objects/_learning_object_horizontal.erb @@ -1,12 +1,16 @@ +<% link = learning_object_path(id: learning_object.id) %> <div class="learning-object-horizontal"> <div class="media"> <div class="media-left media-middle"> <div class="learning-object-thumbnail"> - <a href="#"> - <img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image'> + <a href="<%= link %>"> + <% if learning_object.thumbnail == "thumbnai" %> + <%= image_tag('learning-object-preview.png') %> + <% else %> + <img src="<%= learning_object.thumbnail %>" alt="Prévia do objeto"> + <% end %> + <%= render 'learning_objects/actions_buttons' %> </a> - - <%= render 'learning_objects/actions_buttons' %> </div> </div> <div class="media-body"> -- GitLab