diff --git a/app/assets/stylesheets/application/welcome.scss b/app/assets/stylesheets/application/welcome.scss
index 293aecd53359ddd05db69e7f4d3dd9978247120a..cfff8a5c751502da8e83fca3a908657c0b03a087 100644
--- a/app/assets/stylesheets/application/welcome.scss
+++ b/app/assets/stylesheets/application/welcome.scss
@@ -15,7 +15,6 @@ $carousel_size: 400px;
.carousel {
height: $carousel_size;
- margin-bottom: 60px;
h1{
background-color: rgba(37, 68, 32, 0.75);
}
@@ -27,6 +26,9 @@ $carousel_size: 400px;
.carousel h1 {
background-color: rgba(0, 0, 0, 0.75);
}
+.carousel ol {
+ background-color: rgba(0, 0, 0, 0.75);
+}
.carousel-caption {
z-index: 10;
@@ -41,7 +43,8 @@ $carousel_size: 400px;
top: 0;
left: 0;
min-width: 100%;
- height: $carousel_size;
+ height: 400px !important;
+
}
.carousel-indicators li {
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index c3353d960229b8a8882d717ab44145b7996c6ea7..fe7a119eb184fc2002fc805f899a637be189821c 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -5,9 +5,7 @@ class WelcomeController < ApplicationController
@General = Array.new
mainPage = repository.for(:mainPage).find_all.first
- @Carousel = mainPage["carousel"].collect do |id|
- repository.for(:webLink).find_by_id(id)[0] #orientdb returns a hash inside an array, I want only the hash
- end
+ @Carousel = carousel_repository.all
@General = mainPage["highlights"].collect do |id|
repository.for(:learning_object).find(id)
@@ -31,4 +29,10 @@ class WelcomeController < ApplicationController
def contact
end
+
+ private
+
+ def carousel_repository
+ repository.for :carousel
+ end
end
diff --git a/app/views/management/carousels/index.html.erb b/app/views/management/carousels/index.html.erb
index 19d66557f336cab0ed05f51731610dcbdfa20ed6..41ded4798a765b22fd69c5fd521a4309a0c2ce0e 100644
--- a/app/views/management/carousels/index.html.erb
+++ b/app/views/management/carousels/index.html.erb
@@ -35,6 +35,8 @@
<td class="ls-txt-right ls-regroup">
<%= link_to 'Excluir', management_carousel_path(c), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
</td>
+ <td>
+ </td>
</tr>
<% end %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 7275f6c893bc8910c135648718c276c2d379aeef..13d7dd145212c5386e199f8f527b837b9bf71046 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -23,12 +23,11 @@
<% highlight_class="item" %>
<% end %>
<div class="<%= highlight_class %>">
- <%= image_tag 'mecshow_logo.jpg'%>
+ <%= image_tag highlight.image.url(:larger) %>
<div class="container">
<div class="carousel-caption">
- <h1><%= highlight['title'] %></h1>
- <p id="carrousel-new-description"><%= highlight['description'] %> </p>
- <p><a class="btn btn-lg btn-primary" href=<%= highlight['URL'] %> role="button">Mais informações</a></p>
+ <h1><%= highlight.title %></h1>
+ <p><a class="btn btn-lg btn-primary" href=<%= highlight.url %> role="button">Mais informações</a></p>
</div>
</div>
</div>
diff --git a/public/system/carousels/images/000/000/002/larger/images.jpg b/public/system/carousels/images/000/000/002/larger/images.jpg
deleted file mode 100644
index 92361261a1db144e1a19669e23c5757cecd2d76b..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/002/larger/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/002/original/images.jpg b/public/system/carousels/images/000/000/002/original/images.jpg
deleted file mode 100644
index afe8ae1c534446874ed6826290b9bdd95842ce17..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/002/original/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/002/thumbnail/images.jpg b/public/system/carousels/images/000/000/002/thumbnail/images.jpg
deleted file mode 100644
index 0dfff98942e16e665011b2934aaf6961fed2188b..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/002/thumbnail/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/003/larger/images.jpg b/public/system/carousels/images/000/000/003/larger/images.jpg
deleted file mode 100644
index 92361261a1db144e1a19669e23c5757cecd2d76b..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/003/larger/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/003/original/images.jpg b/public/system/carousels/images/000/000/003/original/images.jpg
deleted file mode 100644
index afe8ae1c534446874ed6826290b9bdd95842ce17..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/003/original/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/003/thumbnail/images.jpg b/public/system/carousels/images/000/000/003/thumbnail/images.jpg
deleted file mode 100644
index 0dfff98942e16e665011b2934aaf6961fed2188b..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/003/thumbnail/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/005/larger/images.jpg b/public/system/carousels/images/000/000/005/larger/images.jpg
deleted file mode 100644
index 92361261a1db144e1a19669e23c5757cecd2d76b..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/005/larger/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/005/original/images.jpg b/public/system/carousels/images/000/000/005/original/images.jpg
deleted file mode 100644
index afe8ae1c534446874ed6826290b9bdd95842ce17..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/005/original/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/005/thumbnail/images.jpg b/public/system/carousels/images/000/000/005/thumbnail/images.jpg
deleted file mode 100644
index 0dfff98942e16e665011b2934aaf6961fed2188b..0000000000000000000000000000000000000000
Binary files a/public/system/carousels/images/000/000/005/thumbnail/images.jpg and /dev/null differ
diff --git a/public/system/carousels/images/000/000/008/larger/picture.png b/public/system/carousels/images/000/000/008/larger/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..86da177b53b506f0a140f8d5c511b1d0960bec29
Binary files /dev/null and b/public/system/carousels/images/000/000/008/larger/picture.png differ
diff --git a/public/system/carousels/images/000/000/008/original/picture.png b/public/system/carousels/images/000/000/008/original/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c60256051b29f1af42eae8e9eb05d469d4b02d5
Binary files /dev/null and b/public/system/carousels/images/000/000/008/original/picture.png differ
diff --git a/public/system/carousels/images/000/000/008/thumbnail/picture.png b/public/system/carousels/images/000/000/008/thumbnail/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8a0542c5a10a73e6ebeb8baaa883e4c21ff1fb9
Binary files /dev/null and b/public/system/carousels/images/000/000/008/thumbnail/picture.png differ
diff --git a/public/system/carousels/images/000/000/009/larger/Rio-2016-Logo.jpg b/public/system/carousels/images/000/000/009/larger/Rio-2016-Logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5a309dffe55acbeceb80514a5c20043d83c57193
Binary files /dev/null and b/public/system/carousels/images/000/000/009/larger/Rio-2016-Logo.jpg differ
diff --git a/public/system/carousels/images/000/000/009/original/Rio-2016-Logo.jpg b/public/system/carousels/images/000/000/009/original/Rio-2016-Logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fbfec167a95c0a9d4153adcd9766a5b82e64bab0
Binary files /dev/null and b/public/system/carousels/images/000/000/009/original/Rio-2016-Logo.jpg differ
diff --git a/public/system/carousels/images/000/000/009/thumbnail/Rio-2016-Logo.jpg b/public/system/carousels/images/000/000/009/thumbnail/Rio-2016-Logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..553d9e59cfb02d5b1723247e338d2d6545d51b8e
Binary files /dev/null and b/public/system/carousels/images/000/000/009/thumbnail/Rio-2016-Logo.jpg differ
diff --git a/public/system/carousels/images/000/000/010/larger/professores.jpg b/public/system/carousels/images/000/000/010/larger/professores.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6962777f6ad88d0885c497cb5fae4ec9f3ddd2fe
Binary files /dev/null and b/public/system/carousels/images/000/000/010/larger/professores.jpg differ
diff --git a/public/system/carousels/images/000/000/010/original/professores.jpg b/public/system/carousels/images/000/000/010/original/professores.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8a074077c4d44c00492aab51c11ea8d425f3acc3
Binary files /dev/null and b/public/system/carousels/images/000/000/010/original/professores.jpg differ
diff --git a/public/system/carousels/images/000/000/010/thumbnail/professores.jpg b/public/system/carousels/images/000/000/010/thumbnail/professores.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eac5b4f56661151497bacc71880ee563f07a62e1
Binary files /dev/null and b/public/system/carousels/images/000/000/010/thumbnail/professores.jpg differ