Skip to content
Snippets Groups Projects
Commit bf9f207f authored by Matheus Agio Nerone's avatar Matheus Agio Nerone
Browse files

Merge branch 'master' into log-in-contrast

parents 17aa3cba 03b97bfb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 512 additions and 359 deletions
app/assets/javascripts/application.js
+ 0
− 133
View file @ bf9f207f
......@@ -17,136 +17,3 @@
//= require bootstrap-sprockets
//= 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(){
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');
});
}
Contrast();
});
//source: http://www.linhadecodigo.com.br/artigo/1615/acessibilidade-aumentando-e-diminuindo-tamanho-de-letra-em-seu-site.aspx
function createCookie(name,value,days) {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString();
} else var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
function readCookie(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(";");
for(var i=0;i < ca.length;i++)
{
var c = ca[i];
while (c.charAt(0)==" ") c = c.substring(1,c.length);
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
}
return null;
}
function resizeText(increment) {
if (document.body.style.fontSize == "") {
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');
});
}
}
else{
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');
});
}
createCookie('fontSize', parseFloat(document.body.style.fontSize), 365);
}
function changeContrast() {
if (readCookie('contrast') == null || readCookie('contrast') == "false") {
createCookie('contrast',"true",0);
} else {
createCookie('contrast',"false",0);
}
Contrast();
}
function Contrast() {
contrast_c = readCookie('contrast');
if (contrast_c == null || contrast_c != "true"){
$('body').addClass('contraste');
$('.barra-brasil').addClass('contraste');
$('.search-bar').addClass('contraste');
$('.search-bar').css('border-top','2px solid white');
$('#menu-bar').addClass('menu-bar-contrast');
$('.object-vertical .panel').addClass('contraste');
$('.navbar').addClass('contraste');
$('.well').addClass('contraste');
}else {
$('body').removeClass('contraste');
$('.barra-brasil').removeClass('contraste');
$('.search-bar').removeClass('contraste');
$('.search-bar').css('border-top','none');
$('#menu-bar').removeClass('menu-bar-contrast');
$('.object-vertical .panel').removeClass('contraste');
$('.navbar').removeClass('contraste');
$('.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/accessibility.js 0 → 100644
+ 107
− 0
View file @ bf9f207f
//// font size
var fontSize = function() {
var elements = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', '.btn'],
elements_length = elements.length,
elements_size = {};
// get elements size with jquery after document ready
$(document).ready(function() {
for (var i = 0; i < elements_length; i++) {
elements_size[elements[i]] = $(elements[i]).css('fontSize');
}
});
// init
size_c = readCookie('fontSize');
if (size_c != null) {
$(document).ready(function() {
reloadFontSize(size_c);
});
}
function reloadFontSize(size) {
var i = 0;
size = (parseFloat(size) / 10) + 1;
// change body font size
$('body').css('fontSize', (size * 100) + '%', 'important');
// change custom elements
for (i; i < elements_length; i++) {
$(elements[i]).css('fontSize', (parseFloat(elements_size[elements[i]]) * size) + "px", 'important');
}
}
return {
resizeText: function(increment) {
var size = parseFloat(readCookie('fontSize'));
increment = parseFloat(increment);
if (increment === 0) size = 0;
else if (((size > -6) && (increment < 0)) || ((size < 7) && (increment > 0))) {
size = size + increment;
};
reloadFontSize(size);
createCookie('fontSize', size, 365);
}
};
}
//// contrast
var contrast = function() {
var contrast_elements = 'body, .barra-brasil, .search-bar, .learning-object-vertical .panel, .navbar, .well';
// init
$(document).ready(function() {
run();
});
function run() {
var contrast_c = readCookie('contrast');
if (contrast_c == null || contrast_c != "true") {
$(contrast_elements).removeClass('contraste');
$('.search-bar').css('border-top','none');
$('#menu-bar').removeClass('menu-bar-contrast');
}
else {
$(contrast_elements).addClass('contraste');
$('.search-bar').css('border-top','2px solid white');
$('#menu-bar').addClass('menu-bar-contrast');
}
}
return {
change: function() {
(readCookie('contrast') == "true") ? createCookie('contrast',"false",0) : createCookie('contrast',"true",0);
run();
}
};
}
//// cookies
//source: http://www.linhadecodigo.com.br/artigo/1615/acessibilidade-aumentando-e-diminuindo-tamanho-de-letra-em-seu-site.aspx
function createCookie(name,value,days) {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString();
} else var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
function readCookie(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(";");
for (var i=0;i < ca.length;i++) {
var c = ca[i];
while (c.charAt(0)==" ") c = c.substring(1,c.length);
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
}
return null;
}
// define global variables
var fontSize = fontSize();
var contrast = contrast();
app/assets/javascripts/application/collections.coffee 0 → 100644
+ 8
− 0
View file @ bf9f207f
$ ->
$('#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
+ 21
− 7
View file @ bf9f207f
......@@ -27,7 +27,7 @@ body {
padding:0;
height:100%;
font-size: 15px;
font-size: 100%;
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
}
......@@ -92,11 +92,14 @@ header {
.logo {
margin-top: 10px;
padding: 0px;
font-size: 24px;
// font-size: 24px;
font-weight: bold;
text-align: center;
float: left;
width: 165px;
h3 {
margin-top: 10px;
}
a {
color: #FFF;
}
......@@ -153,11 +156,15 @@ header {
// user info
.status-text {
margin-top: 20px;
font-size: 20px;
// font-size: 20px;
text-align: right;
h2, h4 {
margin-top: 5px;
}
.media-heading {
font-size: 32px;
// font-size: 32px;
a {
color: #FFF;
}
......@@ -178,20 +185,27 @@ header {
.nav {
height: 50px;
h3 {
margin-top: 13px;
}
.nav-button {
min-width: 140px;
min-width: 130px;
height: 100%;
font-size: 20px;
padding-left: 15px;
padding-right: 10px;
// font-size: 20px;
font-weight: 500 !important;
a { color: #000; }
}
.nav-button-first {
a { padding-left: 0px !important; }
padding-left: 0 !important;
}
.divider {
width: 2px;
margin-left: 3px;
height: 100%;
background-color: #FFF;
}
......
app/controllers/users_controller.rb 0 → 100644
+ 5
− 0
View file @ bf9f207f
class UsersController < ApplicationController
def show
@objects = repository.for(:learning_object).all
end
end
app/helpers/learning_objects_helper.rb
+ 11
− 0
View file @ bf9f207f
......@@ -4,4 +4,15 @@ module LearningObjectsHelper
categories.to_s
end
def render_learning_object(orientation, learning_object)
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
end
end
app/models/learning_object.rb
+ 2
− 2
View file @ bf9f207f
class LearningObject
include ActiveModel::Model
attr_accessor :id, :id_dspace, :rid, :name, :description,
:thumbnail, :date_creation, :last_modified,
:thumbnail, :created_at, :last_modified,
:type, :bitstreams, :metadata, :likes, :views, :downloads
validates_presence_of :name, :date_creation, :type, :likes, :views, :downloads
validates_presence_of :name, :created_at, :type, :likes, :views, :downloads
validates_numericality_of :likes, greater_than_or_equal_to: 0
validates_numericality_of :views, greater_than_or_equal_to: 0
validates_numericality_of :downloads, greater_than_or_equal_to: 0
......
app/models/search.rb 0 → 100644
+ 21
− 0
View file @ bf9f207f
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/views/collections/_collection.html.erb 0 → 100644
+ 31
− 0
View file @ bf9f207f
<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 @ bf9f207f
<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 @ bf9f207f
<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 @ bf9f207f
<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
+ 1
− 10
View file @ bf9f207f
<%=
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
%>
<%= render_learning_object orientation, learning_object %>
app/views/shared/application/_header.html.erb
+ 15
− 13
View file @ bf9f207f
......@@ -17,17 +17,17 @@
<div class="logo">
<%= link_to root_path do %>
<%= image_tag image_path("logo.png"), class: "logo-image" %><br/>
CONTEÚDO EDUCACIONAL
<h3>CONTEÚDO EDUCACIONAL</h3>
<% end %>
</div>
</div>
<div class="col-md-6">
<div class="search-accessibility">
<%= image_tag 'fonte_mais.png', onclick: 'resizeText(1)' %>&nbsp;&nbsp;
<%= image_tag 'fonte_inicial.png', onclick: 'resizeText(0)' %>&nbsp;&nbsp;
<%= image_tag 'fonte_menos.png', onclick: 'resizeText(-1)' %>&nbsp;&nbsp;
<%= image_tag 'contraste.png', onclick: 'changeContrast()' %>
<%= image_tag 'fonte_mais.png', onclick: 'fontSize.resizeText(1)' %>&nbsp;&nbsp;
<%= image_tag 'fonte_inicial.png', onclick: 'fontSize.resizeText(0)' %>&nbsp;&nbsp;
<%= image_tag 'fonte_menos.png', onclick: 'fontSize.resizeText(-1)' %>&nbsp;&nbsp;
<%= image_tag 'contraste.png', onclick: 'contrast.change()' %>
</div>
<div class="search-input">
<form action="/search" method="get">
......@@ -46,8 +46,8 @@
<% if user_signed_in? %>
<div class="media">
<div class="media-body">
<h4 class="media-heading"><%= link_to current_user.name.split(" ").first, edit_user_registration_path %></h4>
<%= link_to 'sair', destroy_user_session_path, method: 'delete', class: "quit-link" %>
<h2 class="media-heading"><%= link_to current_user.name.split(" ").first, edit_user_registration_path %></h2>
<h4><%= link_to 'sair', destroy_user_session_path, method: 'delete', class: "quit-link" %></h4>
</div>
<div class="media-right">
<a href="#">
......@@ -58,8 +58,8 @@
<% else %>
<div class="media">
<div class="media-body">
<h4 class="media-heading"><%= link_to 'entre', new_user_session_path %></h4>
ou <%= link_to 'cadastre-se', new_user_registration_path, class: "register-link" %>
<h2 class="media-heading"><%= link_to 'entre', new_user_session_path %></h2>
<h4>ou <%= link_to 'cadastre-se', new_user_registration_path, class: "register-link" %></h4>
</div>
</div>
<% end %>
......@@ -72,10 +72,12 @@
<div class="container">
<div class="row">
<ul class="nav navbar-nav">
<li class="nav-button nav-button-first"><%= link_to 'Assuntos' %></li>
<li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos' %></h3></li>
<li role="separator" class="divider"></li>
<li class="dropdown nav-button">
<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0);">Níveis de Ensino&nbsp;<span class="caret" /></a>
<h3>
<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0);">Níveis de Ensino&nbsp;<span class="caret" /></a>
</h3>
<ul class="dropdown-menu">
<li>
<div class="row" style="width: 400px;">
......@@ -104,9 +106,9 @@
</ul>
</li>
<li role="separator" class="divider"></li>
<li class="nav-button"><%= link_to 'FAQ', faq_path %></li>
<li class="nav-button"><h3><%= link_to 'FAQ', faq_path %></h3></li>
<li role="separator" class="divider"></li>
<li class="nav-button"><%= link_to 'Contato', contact_path %></li>
<li class="nav-button"><h3><%= link_to 'Contato', contact_path %></h3></li>
<li role="separator" class="divider"></li>
</ul>
</div>
......
app/views/users/show.html.erb 0 → 100644
+ 58
− 0
View file @ bf9f207f
<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 @ bf9f207f
......@@ -27,6 +27,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