diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
index 31c417df12a32253c11bc8ef25e09d7339d90b89..fd66544072ba7863cd8b9d691fea4c81b162b347 100644
Binary files a/app/assets/images/logo.png and b/app/assets/images/logo.png differ
diff --git a/app/assets/images/user-anon.png b/app/assets/images/user-anon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2ab8da5945a930140730c855609d1e32ee7103f
Binary files /dev/null and b/app/assets/images/user-anon.png differ
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c1e8f708f3e00a670b82b076568ffd37d1350b43..e40ab0da806e69f568d70494bbc2db4286f6018c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,34 +18,16 @@
//= require select2
//= require_tree ./application
-/*
-$('h2').each(function(index,value) {
- $(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
-});
-$('h3').each(function(index,value) {
- $(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
-});
-$('h4').each(function(index,value) {
- $(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
-});
-$('h5').each(function(index,value) {
- $(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
-});
-$('h6').each(function(index,value) {
- $(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
-});
-*/
-
$(document).ready(function(){
+ //// accessibility
+ // font size
size_c = readCookie('fontSize');
if (size_c != null) {
document.body.style.fontSize = size_c + 'px';
- $('.dropdown-menu').css('fontSize', document.body.style.fontSize);
- $('h1,h2,h3,h4,h5,h6').each(function(index,value) {
- $(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
- });
+ reloadFont(size_c - 15);
}
- Contrast();
+ // contrast
+ contrast();
});
@@ -76,44 +58,35 @@ function resizeText(increment) {
document.body.style.fontSize = "15px";
}
size = parseFloat(document.body.style.fontSize)
- if (increment > 0) {
- if (size < 25) {
- document.body.style.fontSize = parseFloat(document.body.style.fontSize) + increment + "px";
- $('.dropdown-menu').css('fontSize', document.body.style.fontSize);
- $('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
- $(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
- });
- }
- } else if(increment < 0){
- if (size > 10) {
- document.body.style.fontSize = parseFloat(document.body.style.fontSize) + increment + "px";
- $('.dropdown-menu').css('fontSize', document.body.style.fontSize);
- $('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
- $(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
- });
- }
+ if ((increment > 0) && (size < 25) || ((increment < 0) && (size > 10))) {
+ document.body.style.fontSize = parseFloat(document.body.style.fontSize) + increment + "px";
+ reloadFont(increment);
}
- else{
+ else if (increment === 0) {
size = parseFloat(document.body.style.fontSize);
document.body.style.fontSize = '15px';
- $('.dropdown-menu').css('fontSize', document.body.style.fontSize);
- $('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
- $(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
- });
+ reloadFont(increment);
}
createCookie('fontSize', parseFloat(document.body.style.fontSize), 365);
}
+function reloadFont(increment) {
+ $('.dropdown-menu').css('fontSize', document.body.style.fontSize);
+ $('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
+ $(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
+ });
+}
+
function changeContrast() {
if (readCookie('contrast') == null || readCookie('contrast') == "false") {
createCookie('contrast',"true",0);
} else {
createCookie('contrast',"false",0);
}
- Contrast();
+ contrast();
}
-function Contrast() {
+function contrast() {
contrast_c = readCookie('contrast');
if (contrast_c == null || contrast_c != "true"){
$('body').addClass('contraste');
@@ -135,18 +108,3 @@ function Contrast() {
$('.well').removeClass('contraste');
}
}
-
-
-$.fn.select2.amd.require(
- ["select2/core", "select2/utils", "select2/compat/matcher"],
- function (Select2, Utils, oldMatcher) {
-
- var $basicMultiple = $(".js-example-basic-multiple");
- var $limitMultiple = $(".js-example-basic-multiple-limit");
-
- $basicMultiple.select2();
- $basicMultiple.select2({ width: '80%' });
- $limitMultiple.select2({
- maximumSelectionLength: 2
- });
-});
diff --git a/app/assets/javascripts/application/collections.coffee b/app/assets/javascripts/application/collections.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..04a4d2015eb8de7fe0a63e9d371fd15ea5396170
--- /dev/null
+++ b/app/assets/javascripts/application/collections.coffee
@@ -0,0 +1,8 @@
+$ ->
+ $('#create_collection_popover').popover
+ html: true
+ content: ->
+ $('#create_collection_popover_content').html()
+ title: ->
+ $('#create_collection_popover_title').html()
+ return
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 154175ad3bc6c610531bf93a4c6e62c9a7f020cd..37b65ca3e1526f824cb6260cd7c35a05dba0498f 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -18,6 +18,8 @@
@import "select2";
@import "select2-bootstrap";
+$header-blue: #1676bc;
+
//// HTML/BODY
html,
body {
@@ -52,7 +54,7 @@ header {
border: 0;
border-bottom: 1px;
border-style: solid;
- border-color: #cececd;
+ border-color: $header-blue;
margin-bottom: 16px;
a, a:focus, a:hover {
@@ -84,15 +86,24 @@ header {
margin: 0px;
// logo
- .logo-text {
+ .logo-container {
+ text-align: left;
+ }
+ .logo {
margin-top: 10px;
padding: 0px;
font-size: 24px;
font-weight: bold;
+ text-align: center;
+ float: left;
+ width: 165px;
a {
color: #FFF;
}
}
+ .logo-image {
+ width: 100px;
+ }
// accessibility
.search-accessibility {
margin-top: 25px;
@@ -145,12 +156,6 @@ header {
font-size: 20px;
text-align: right;
- .circular-image {
- width: 60px;
- height: 60px;
- border-radius: 50%;
- }
-
.media-heading {
font-size: 32px;
a {
@@ -226,7 +231,7 @@ footer {
}
//// partial OBJECT
-.object-horizontal {
+.learning-object-horizontal, .learning-object-vertical {
margin-bottom: 20px;
}
diff --git a/app/assets/stylesheets/application/users.scss b/app/assets/stylesheets/application/users.scss
new file mode 100644
index 0000000000000000000000000000000000000000..334ce327e22cfb358fe6cdb6a6b8a2306f84ae9a
--- /dev/null
+++ b/app/assets/stylesheets/application/users.scss
@@ -0,0 +1,25 @@
+$header-blue: #1676bc;
+
+.user-image {
+ width: 60px;
+ height: 60px;
+ border-radius: 50%;
+}
+
+.user-header {
+ background-color: #e7e7e8;
+ width: 100%;
+ min-height: 100px;
+ padding: 15px;
+
+ .right-column {
+ text-align: right;
+
+ .btn {
+ background-color: $header-blue;
+ color: white;
+ border: 0px;
+ min-width: 150px;
+ }
+ }
+}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..16a142622ac082465d1222429fbd9bfb45ff0dcd
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,5 @@
+class UsersController < ApplicationController
+ def show
+ @objects = repository.for(:learning_object).all
+ end
+end
diff --git a/app/models/search.rb b/app/models/search.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a92037f954023ff18fd5bf39199c38cab5189de7
--- /dev/null
+++ b/app/models/search.rb
@@ -0,0 +1,21 @@
+class Search
+ include ActiveModel::Model
+ attr_accessor :results_per_page, :sort, :query, :results
+
+ validates_presence_of :query, :results_per_page, :sort
+ validates_numericality_of :results_per_page, greater_than: 0
+
+ def initialize(params={})
+ super(params.merge(defaults))
+ end
+
+ private
+
+ def defaults
+ {
+ sort: 'relevance',
+ results_per_page: 10
+ }
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 28100ca583e944ea07f031fab91efee58583551d..855ae8b7a7b1e7cf7d08afadd72d8c6edc555d5f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -26,6 +26,6 @@ class User < ActiveRecord::Base
after_create SyncUserRepositoryService.new
after_destroy SyncUserRepositoryService.new
- has_attached_file :avatar, styles: { medium: "300x300>", thumb: "60x60>" }, default_url: ActionController::Base.helpers.asset_path('missing.svg')
+ has_attached_file :avatar, styles: { medium: "300x300>", thumb: "60x60>" }, default_url: ActionController::Base.helpers.asset_path('user-anon.png')
validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
end
diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..eaa86d05f3c146f5e0d2ee4a60c91c7413fd055d
--- /dev/null
+++ b/app/views/collections/_collection.html.erb
@@ -0,0 +1,31 @@
+<div class="row collections">
+ <h2><%= title %></h2>
+
+ <% learning_objects.each do |learning_object| %>
+ <!-- item -->
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b><%= learning_object.categories %></b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading"><%= learning_object.name %></h4>
+ <span class="glyphicon glyphicon-eye-open"> <%= learning_object.views %> </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
+ </div>
+ </div>
+ <!-- /item -->
+ <% end %>
+
+</div>
\ No newline at end of file
diff --git a/app/views/collections/_create.html.erb b/app/views/collections/_create.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..a0f48962395b5723585e9d761128bd67af7b5de0
--- /dev/null
+++ b/app/views/collections/_create.html.erb
@@ -0,0 +1,9 @@
+<a href="#" id="create_collection_popover">Criar coleção</a>
+
+<div id="create_collection_popover_content" style="display: none">
+ <%= render 'form' %>
+</div>
+
+<div id="create_collection_popover_title" style="display: none">
+ Criar coleção
+</div>
\ No newline at end of file
diff --git a/app/views/collections/_form.html.erb b/app/views/collections/_form.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..aaa75f9e1a311115f098aaff59ed87f318c69001
--- /dev/null
+++ b/app/views/collections/_form.html.erb
@@ -0,0 +1,12 @@
+<form>
+ <label>Nome da coleção</label>
+ <input type='text' style="width:250px"/>
+
+ <label>Privacidade</label>
+ <select>
+ <option>Público</option>
+ <option>Somente seguidores</option>
+ </select>
+
+ <input type="submit"/>
+</form>
\ No newline at end of file
diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb
index 68aebfd77d68d1e74c4b6af2e9ea566d8babac6a..17a6fc78e9ac25830ddafd57c38714d7c5ad5f93 100644
--- a/app/views/collections/index.html.erb
+++ b/app/views/collections/index.html.erb
@@ -1,229 +1,245 @@
<h1>Coleções de Recursos</h1>
-<div class="row recommend-collections">
- <h2>Recomendamos para você</h2>
-
- <!-- item -->
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Compreensão oral</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
+<% if @collections.count == 0 %>
+ <div class="row no-collections">
+ <p>Nenhuma coleção foi criada, seja o primeiro!</p>
+ </div>
+<% else %>
+
+ <div class="row recommend-collections">
+ <h2>Recomendamos para você</h2>
+
+ <!-- item -->
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Compreensão oral</b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
- <!-- /item -->
-
-
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Educação Básica</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
+ <!-- /item -->
+
+
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Educação Básica</b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Ensino Médio</b></h4>
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Ensino Médio</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
</div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
- </div>
- </div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
-</div>
-
-<div class="row newest-collections">
- <h2>Últimas coleções</h2>
-
- <!-- item -->
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Compreensão oral</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
</div>
- </div>
- <!-- /item -->
-
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Educação Básica</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
+ <div class="row newest-collections">
+ <h2>Últimas coleções</h2>
+
+ <!-- item -->
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Compreensão oral</b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
+ </div>
+ </div>
+ <!-- /item -->
+
+
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Educação Básica</b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Ensino Médio</b></h4>
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Ensino Médio</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
</div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
- </div>
- </div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
-</div>
-
-<div class="row newest-collections">
- <h2>Últimas coleções</h2>
-
- <!-- item -->
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Compreensão oral</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
</div>
- </div>
- <!-- /item -->
-
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Educação Básica</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
+ <div class="row newest-collections">
+ <h2>Últimas coleções</h2>
+
+ <!-- item -->
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Compreensão oral</b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
+ </div>
+ </div>
+ <!-- /item -->
+
+
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Educação Básica</b></h4>
+
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
+ </div>
+
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
+ <div class="col-sm-4">
+ <div class="row">
+ <h4><b>Ensino Médio</b></h4>
- <div class="col-sm-4">
- <div class="row">
- <h4><b>Ensino Médio</b></h4>
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading">Los derechos del animal (1)</h4>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
+ <div class="object-vertical">
+ <div class="panel">
+ <div>
+ <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
+ </div>
+ <div class="panel-body">
+ <h4 class="media-heading">Los derechos del animal (1)</h4>
+ <span class="glyphicon glyphicon-eye-open">200 </span>
+ <span class="glyphicon glyphicon-star">4,5 </span>
+ <span>Por <a>Usuário </a></span>
+ </div>
+ </div>
</div>
+
+ <p>
+ <a href="#">Ver Mais</a>
+ </p>
</div>
</div>
-
- <p>
- <a href="#">Ver Mais</a>
- </p>
</div>
- </div>
-</div>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/learning_objects/_learning_object.erb b/app/views/learning_objects/_learning_object.erb
index d1ed26f2a6ed15e5564ff8d056e5029913029f75..a345ac2d3a044b25096ec02f807b74bbabb22058 100644
--- a/app/views/learning_objects/_learning_object.erb
+++ b/app/views/learning_objects/_learning_object.erb
@@ -1,27 +1,10 @@
-<div class="learning_object-horizontal">
- <div class="media">
- <div class="media-left media-middle">
- <a href="#">
- <img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image'>
- </a>
- </div>
- <div class="media-body">
- <a href="<%= learning_object_path(id: learning_object.id) %>">
- <% if learning_object.name.nil? %>
- <h4 class="media-heading">Sem TÃtulo</h4>
- <% else %>
- <h4 class="media-heading"><%= learning_object.name %></h4>
- <% end %>
- </a>
- <span>Por <a>Usuário </a></span><br/>
- <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %> </span>
- <span class="glyphicon glyphicon-star"><%= learning_object.likes %> </span><br>
- <% unless learning_object.description.nil? %>
- <%= learning_object.description %>
- <br/>
- <% end %>
- <br/>
- Em<b> <%= show_categories learning_object.categories %></b>
- </div>
- </div>
-</div>
\ No newline at end of file
+<%=
+ case(orientation)
+ when "vertical"
+ render "learning_objects/learning_object_vertical", learning_object: learning_object
+ when "horizontal"
+ render "learning_objects/learning_object_horizontal", learning_object: learning_object
+ else
+ render "learning_objects/learning_object_horizontal", learning_object: learning_object
+ end
+%>
diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb
new file mode 100644
index 0000000000000000000000000000000000000000..31a37eebdc2e64e6095f8988119062c251c42c63
--- /dev/null
+++ b/app/views/learning_objects/_learning_object_horizontal.erb
@@ -0,0 +1,27 @@
+<div class="learning-object-horizontal">
+ <div class="media">
+ <div class="media-left media-middle">
+ <a href="#">
+ <img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image'>
+ </a>
+ </div>
+ <div class="media-body">
+ <a href="<%= learning_object_path(id: learning_object.id) %>">
+ <% if learning_object.name.nil? %>
+ <h4 class="media-heading">Sem TÃtulo</h4>
+ <% else %>
+ <h4 class="media-heading"><%= learning_object.name %></h4>
+ <% end %>
+ </a>
+ <span>Por <a>Usuário </a></span><br/>
+ <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %> </span>
+ <span class="glyphicon glyphicon-star"><%= learning_object.likes %> </span><br>
+ <% unless learning_object.description.nil? %>
+ <%= learning_object.description %>
+ <br/>
+ <% end %>
+ <br/>
+ Em<b> <%= show_categories learning_object.categories %></b>
+ </div>
+ </div>
+</div>
diff --git a/app/views/shared/application/_object_vertical.html.erb b/app/views/learning_objects/_learning_object_vertical.erb
similarity index 50%
rename from app/views/shared/application/_object_vertical.html.erb
rename to app/views/learning_objects/_learning_object_vertical.erb
index 8a4b66c025827a3d651e3e28869f32d58b3341b7..ff0bc2740338a08f42eda2dc7754a8732f515cbe 100644
--- a/app/views/shared/application/_object_vertical.html.erb
+++ b/app/views/learning_objects/_learning_object_vertical.erb
@@ -1,16 +1,16 @@
-<div class="object-vertical">
+<div class="learning-object-vertical">
<div class="panel">
<div>
<img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image' class="img-responsive">
</div>
<div class="panel-body">
- <% if object.name.nil? %>
+ <% if learning_object.name.nil? %>
<h4 class="media-heading">Sem TÃtulo</h4>
<% else %>
- <h4 class="media-heading"><%= object.name %></h4>
+ <h4 class="media-heading"><%= learning_object.name %></h4>
<% end %>
- <span class="glyphicon glyphicon-eye-open">200 </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
+ <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %> </span>
+ <span class="glyphicon glyphicon-star"><%= learning_object.likes %> </span>
<span>Por <a>Usuário </a></span>
</div>
</div>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 1fb3a77ae086e54ea955a51505fbc4be4ced1e29..46f39ee39908c84a87445daf64decea7d72434ff 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -364,10 +364,10 @@
<br/>
<div class="container-fluid">
- <%= render @results %>
+ <%= render @results, orientation: "horizontal" %>
<%= will_paginate @results %>
</div>
<% end %>
</div>
<!-- col-sm-8 -->
-</div><!-- /container -->
\ No newline at end of file
+</div><!-- /container -->
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 81a44137b95d79115859210d4afa93c880e1f3f3..8adcbfca9eecf340465bb88bf67a9dbd7c99d205 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -13,10 +13,13 @@
<div class="search-bar">
<div class="container">
<div class="row">
- <div class="col-md-3 logo-text">
- <%= link_to root_path do %>
- CONTEÚDO<br>EDUCACIONAL
- <% end %>
+ <div class="col-md-3 logo-container">
+ <div class="logo">
+ <%= link_to root_path do %>
+ <%= image_tag image_path("logo.png"), class: "logo-image" %><br/>
+ CONTEÚDO EDUCACIONAL
+ <% end %>
+ </div>
</div>
<div class="col-md-6">
@@ -48,7 +51,7 @@
</div>
<div class="media-right">
<a href="#">
- <img class="circular-image" src="<%= current_user.avatar.url(:thumb) %>" alt="Foto do usuário"/>
+ <img class="user-image" src="<%= current_user.avatar.url(:thumb) %>" alt="Foto do usuário"/>
</a>
</div>
</div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..2d04b8d963b208f4c7f8abd3a6e7ed6746fba944
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,58 @@
+<div class="row">
+ <div class="user-header">
+ <div class="col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <a href="#">
+ <img class="user-image" src="<%= image_path("user-anon.png") %>" alt="Foto do usuário">
+ </a>
+ </div>
+ <div class="media-body">
+ <h4 class="media-heading">Usuário</h4>
+ <span>nome da instituição</span>
+ <p>
+ x items
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 right-column">
+ <button type="button" class="btn btn-default">Seguir</button>
+ </div>
+ </div>
+
+ <div class="user-files">
+ <div class="row">
+ <div class="col-md-6">
+ <div class="media">
+ <div class="media-body">
+ <h4 class="media-heading">Arquivos do usuário</h4>
+ <p>
+ x items
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 right-column">
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-md-3">
+ <%= render @objects[0], orientation: "vertical" %>
+ </div>
+ <div class="col-md-6">
+ <div class="row">
+ <div class="col-md-3"></div>
+ <div class="col-md-6">
+ <%= render @objects[1], orientation: "vertical" %>
+ </div>
+ <div class="col-md-3"></div>
+ </div>
+ </div>
+ <div class="col-md-3">
+ <%= render @objects[2], orientation: "vertical" %>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index d6bef8eaef28eefcf1c5049d962f4b2a2945e268..08164ac82b5d954ccd947f698f1a8550d5f131ab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,7 @@ Rails.application.routes.draw do
resources :institutions
resources :collections
+ get 'users/:id', to: 'users#show', as: 'users_show'
get '/faq' => 'welcome#faq'
get '/contact' => 'welcome#contact', as: 'contact'