diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 1bb06b753869ec458634dc09547fd9d0b9b90352..e16b2017ddae3781d5164085903b79ee171b4ee7 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -413,7 +413,7 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
.thumb{
width:250px;
- float: left;
+ // float: left;
margin-left: 5px;
border: solid 1px #ccc;
}
diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss
index 12bfef695efde3ce5aa800c132bb2934d8fcaa67..7fa61953fe702ed848fd7ac82d1b50dba60a0652 100644
--- a/app/assets/stylesheets/application/learning_objects.scss
+++ b/app/assets/stylesheets/application/learning_objects.scss
@@ -75,7 +75,7 @@ $background-grey: #e7e7e8;
font-weight: 400;
}
.rightbar {
- margin-top: 230px;
+ margin-top: 100px;
.media-heading {
white-space: nowrap;
diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb
index 25c0ccd0ff7389b27b2914f1277eca24db9c5b0a..d29552f7feb642883fb6c02c245019480aab279a 100644
--- a/app/views/learning_objects/show.html.erb
+++ b/app/views/learning_objects/show.html.erb
@@ -26,15 +26,17 @@
<div class="row learning-object">
<div class="col-md-7">
<%= learning_object_thumbnail @learning_object, "large" %>
- <div class="stats">
+ <div class="pull-right" style="padding-right:122px">
<span class="glyphicon glyphicon-eye-open"><%= @learning_object.views %> </span>
<span class="glyphicon glyphicon-star"><%= @learning_object.likes %> </span>
</div>
+ <br/><br/>
<h2 class="title"><%= @learning_object.name %></h2>
<% unless @learning_object.description.nil? %>
<p class="description"><%= @learning_object.description %></p>
<% end %>
<span class="category"><%= ("Em " + show_categories(@learning_object.categories)) unless @learning_object.categories.nil? %></span>
+
</div>
<div class="col-md-5">
<div class="rightbar">
@@ -87,29 +89,14 @@
</div>
</div>
-<!-- <div class="container-fluid">
+ <div class="container-fluid">
<div class="container-fluid">
- <div class="row">
+ <!-- <div class="row">
<div class="col-sm-6">
- <a href="">
- <img alt="<%=@learning_object.name %>" class="img-responsive" height="550" src="<%= @learning_object.thumbnail %>" width="600">
- </a>
- <p>
- <h1><%= @learning_object.name %></h1>
- </p>
+
</div>
<div class="col-sm-6">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-md-12">Adicionado por:
- <h1>
- <img class="img-circle" src="images/user.jpg">
- <a href="autor.php"><%= @learning_object.get_metadata_value_of("dc.contributor.author") %></a>
- </h1>
- </div>
- </div><br/>
- <%= @learning_object.get_metadata_value_of("dc.description") %>
- </div>
+
<div class="col-sm-12">
<br/>
<table class="table">
@@ -132,15 +119,13 @@
</tr>
</table><br/>
<!--div class="pull-right"-->
- <!-- <div style="text-align: center;">
- <a class="btn btn-primary" href="#">Download</a>
- </div>
+<!--
</div>
</div>
- </div>
- <br/><br/>
+ </div>-->
+ <br/>
<div class="row">
- <div class="col-sm-8">
+ <div class="col-sm-7">
<ul>
<li>
<b>Autor:
@@ -176,8 +161,8 @@
like_learning_object_path(@learning_object.id_dspace),
method: :post, remote: true %>
<% end %>
- <br/> -->
- <!-- <div class="row">
+ <br/>
+ <div class="row">
<div class="col-md-12">
<h1>Comentários</h1>
</div>
@@ -242,14 +227,15 @@
</div>
<br/>
- </div> -->
+ </div>
<!--arquivos relacionados-->
- <!-- <div class="col-sm-4">
+ <div class="col-sm-5">
<div class="row">
- <div class="col-md-12">
+ <div class="col-md-12" style ="text-align:center">
<h1>
- Arquivos relacionados
+ Arquivos similares
</h1>
+ <br/><br/>
</div>
</div>
<%# @related_objects.each do |o| %>
@@ -275,10 +261,10 @@
</div>
</div><hr>
<%# end %>
- </div> -->
-<!-- </div>
+ </div>
+</div>
<br/>
</div>
<!-- container fluid -->
-<!-- </div> -->
+ </div>
<!-- /container -->
diff --git a/app/views/welcome/add_file.html.erb b/app/views/welcome/add_file.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..ce941d7f0cb75123c9e0d3c354d36f98eccaa898
--- /dev/null
+++ b/app/views/welcome/add_file.html.erb
@@ -0,0 +1,42 @@
+
+
+
+<div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="container-fluid" style="margin-left:10px;">
+ <%= image_tag image_path('icons/upload.png'), class: "logo",style:"width:50px;" %>
+ <span class="pull-left"><h3 style="position:absolute; margin-left:60px;">Adicionando x arquivos</h3>
+ </div>
+ </div><br/>
+ <div class="grey-panel">
+ <div class="container-fluid">
+ <div class="row">
+ <div class="white-input">
+
+ <div class="col-md-3">
+ <%= image_tag image_path('user-anon.png'), class: "logo" %><br/>
+ <%= link_to 'editar foto', search_path,style:'color: #1676bc;' %>
+ </div>
+ <div class="col-md-9">
+
+ <table style="margin: 20px auto;">
+ <tr>
+ <td>TÃtulo do arquivo</td><td> <input type="password" size="35" placeholder="email"></td>
+ </tr>
+ <tr>
+ <td> <div style="margin-bottom: 15px"> Descrição</div></td><td> <input type="password" size="35" placeholder="email"></td>
+ </tr>
+ <tr>
+ <td> Confirmar senha:</td><td> <input type="password" size="35" placeholder="email"></td>
+ </tr>
+ </table>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 065b616dd2b756203d9698347f0d7c2d353042d6..4d3a4e8027d5607ab6732ad023339f98d0a8dd85 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -59,4 +59,5 @@ Rails.application.routes.draw do
get '/collection' => 'welcome#collection'
get '/login' => 'welcome#login'
get '/account' => 'welcome#account'
+ get '/add_file' => 'welcome#add_file'
end