Skip to content
Snippets Groups Projects
Commit ff852834 authored by Alexandre Peres Arias's avatar Alexandre Peres Arias
Browse files

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents ebb390b3 d4744d85
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 466 additions and 304 deletions
app/assets/images/logo.png
+ 0
− 0
View replaced file @ ebb390b3 View file @ ff852834
app/assets/images/logo.png

13 KiB | W: | H:

app/assets/images/logo.png

213 KiB | W: | H:

app/assets/images/logo.png
app/assets/images/logo.png
app/assets/images/logo.png
app/assets/images/logo.png
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/user-anon.png 0 → 100644
+ 0
− 0
View file @ ff852834
app/assets/images/user-anon.png

1.62 KiB

app/assets/javascripts/application.js
+ 19
− 61
View file @ ff852834
......@@ -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
});
});
app/assets/javascripts/application/collections.coffee 0 → 100644
+ 8
− 0
View file @ ff852834
$ ->
$('#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
app/assets/stylesheets/application.scss
+ 14
− 9
View file @ ff852834
......@@ -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;
}
......
app/assets/stylesheets/application/users.scss 0 → 100644
+ 25
− 0
View file @ ff852834
$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;
}
}
}
app/controllers/users_controller.rb 0 → 100644
+ 5
− 0
View file @ ff852834
class UsersController < ApplicationController
def show
@objects = repository.for(:learning_object).all
end
end
app/models/search.rb 0 → 100644
+ 21
− 0
View file @ ff852834
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
app/models/user.rb
+ 1
− 1
View file @ ff852834
......@@ -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
app/views/collections/_collection.html.erb 0 → 100644
+ 31
− 0
View file @ ff852834
<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&nbsp;</span>
<span>Por <a>Usuário&nbsp;</a></span>
</div>
</div>
</div>
<p>
<a href="#">Ver Mais</a>
</p>
</div>
</div>
<!-- /item -->
<% end %>
</div>
\ No newline at end of file
app/views/collections/_create.html.erb 0 → 100644
+ 9
− 0
View file @ ff852834
<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
app/views/collections/_form.html.erb 0 → 100644
+ 12
− 0
View file @ ff852834
<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
app/views/collections/index.html.erb
+ 210
− 194
View file @ ff852834
<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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span>Por <a>Usuário&nbsp;</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
app/views/learning_objects/_learning_object.erb
+ 10
− 27
View file @ ff852834
<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&nbsp;</a></span><br/>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %>&nbsp;</span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %>&nbsp;</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
%>
app/views/learning_objects/_learning_object_horizontal.erb 0 → 100644
+ 27
− 0
View file @ ff852834
<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&nbsp;</a></span><br/>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %>&nbsp;</span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %>&nbsp;</span><br>
<% unless learning_object.description.nil? %>
<%= learning_object.description %>
<br/>
<% end %>
<br/>
Em<b> <%= show_categories learning_object.categories %></b>
</div>
</div>
</div>
app/views/shared/application/_object_vertical.html.erb → app/views/learning_objects/_learning_object_vertical.erb
+ 5
− 5
View file @ ff852834
<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&nbsp;</span>
<span class="glyphicon glyphicon-star">4,5&nbsp;</span>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %>&nbsp;</span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %>&nbsp;</span>
<span>Por <a>Usuário&nbsp;</a></span>
</div>
</div>
......
app/views/search/index.html.erb
+ 2
− 2
View file @ ff852834
......@@ -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 -->
app/views/shared/application/_header.html.erb
+ 8
− 5
View file @ ff852834
......@@ -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>
......
app/views/users/show.html.erb 0 → 100644
+ 58
− 0
View file @ ff852834
<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>
config/routes.rb
+ 1
− 0
View file @ ff852834
......@@ -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'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment