diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000000000000000000000000000000000000..b8cf4c66f90c51b899e0a92ec74f8b5dd5ce6c15
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,428 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ abstract_type (0.0.7)
+ actionmailer (4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.0)
+ actionview (= 4.2.0)
+ activesupport (= 4.2.0)
+ rack (~> 1.6.0)
+ rack-test (~> 0.6.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ actionview (4.2.0)
+ activesupport (= 4.2.0)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ activejob (4.2.0)
+ activesupport (= 4.2.0)
+ globalid (>= 0.3.0)
+ activemodel (4.2.0)
+ activesupport (= 4.2.0)
+ builder (~> 3.1)
+ activerecord (4.2.0)
+ activemodel (= 4.2.0)
+ activesupport (= 4.2.0)
+ arel (~> 6.0)
+ activesupport (4.2.0)
+ i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ adamantium (0.2.0)
+ ice_nine (~> 0.11.0)
+ memoizable (~> 0.4.0)
+ arel (6.0.3)
+ ast (2.1.0)
+ autoprefixer-rails (6.0.3)
+ execjs
+ json
+ axiom-types (0.1.1)
+ descendants_tracker (~> 0.0.4)
+ ice_nine (~> 0.11.0)
+ thread_safe (~> 0.3, >= 0.3.1)
+ bcrypt (3.1.10)
+ better_errors (2.1.1)
+ coderay (>= 1.0.0)
+ erubis (>= 2.6.6)
+ rack (>= 0.9.0)
+ binding_of_caller (0.7.2)
+ debug_inspector (>= 0.0.1)
+ bootstrap-sass (3.3.5.1)
+ autoprefixer-rails (>= 5.0.0.1)
+ sass (>= 3.3.0)
+ builder (3.2.2)
+ bullet (4.14.7)
+ activesupport (>= 3.0.0)
+ uniform_notifier (~> 1.9.0)
+ byebug (6.0.2)
+ celluloid (0.17.1.2)
+ bundler
+ celluloid-essentials
+ celluloid-extras
+ celluloid-fsm
+ celluloid-pool
+ celluloid-supervision
+ dotenv
+ nenv
+ rspec-logsplit (>= 0.1.2)
+ timers (>= 4.1.1)
+ celluloid-essentials (0.20.2.1)
+ bundler
+ dotenv
+ nenv
+ rspec-logsplit (>= 0.1.2)
+ timers (>= 4.1.1)
+ celluloid-extras (0.20.1)
+ bundler
+ dotenv
+ nenv
+ rspec-logsplit (>= 0.1.2)
+ timers (>= 4.1.1)
+ celluloid-fsm (0.20.1)
+ bundler
+ dotenv
+ nenv
+ rspec-logsplit (>= 0.1.2)
+ timers (>= 4.1.1)
+ celluloid-pool (0.20.1)
+ bundler
+ dotenv
+ nenv
+ rspec-logsplit (>= 0.1.2)
+ timers (>= 4.1.1)
+ celluloid-supervision (0.20.1.1)
+ bundler
+ dotenv
+ nenv
+ rspec-logsplit (>= 0.1.2)
+ timers (>= 4.1.1)
+ chart-js-rails (0.0.9)
+ railties (> 3.1)
+ chronic (0.10.2)
+ climate_control (0.0.3)
+ activesupport (>= 3.0)
+ cocaine (0.5.7)
+ climate_control (>= 0.0.3, < 1.0)
+ coderay (1.1.0)
+ coercible (1.0.0)
+ descendants_tracker (~> 0.0.1)
+ coffee-rails (4.1.0)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.0)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.9.1.1)
+ concord (0.1.5)
+ adamantium (~> 0.2.0)
+ equalizer (~> 0.0.9)
+ connection_pool (2.2.0)
+ curb (0.8.8)
+ dalli (2.7.4)
+ debug_inspector (0.0.2)
+ descendants_tracker (0.0.4)
+ thread_safe (~> 0.3, >= 0.3.1)
+ devise (3.5.1)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 3.2.6, < 5)
+ responders
+ thread_safe (~> 0.1)
+ warden (~> 1.2.3)
+ devise_token_auth (0.1.34)
+ devise (= 3.5.1)
+ rails (~> 4.2)
+ diff-lcs (1.2.5)
+ domain_name (0.5.24)
+ unf (>= 0.0.5, < 1.0.0)
+ dotenv (2.0.2)
+ dspace_rest_client (1.1.2)
+ curb (~> 0.8.6)
+ rest-client (>= 1.7, < 2)
+ equalizer (0.0.11)
+ erubis (2.7.0)
+ execjs (2.6.0)
+ fast_stack (0.1.0)
+ rake
+ rake-compiler
+ flamegraph (0.1.0)
+ fast_stack
+ flay (2.4.0)
+ ruby_parser (~> 3.0)
+ sexp_processor (~> 4.0)
+ flog (4.2.1)
+ ruby_parser (~> 3.1, > 3.1.0)
+ sexp_processor (~> 4.4)
+ globalid (0.3.6)
+ activesupport (>= 4.1.0)
+ gruff (0.6.0)
+ rmagick (>= 2.13.4)
+ hitimes (1.2.3)
+ http-cookie (1.0.2)
+ domain_name (~> 0.5)
+ i18n (0.7.0)
+ ice_nine (0.11.1)
+ jbuilder (2.3.1)
+ activesupport (>= 3.0.0, < 5)
+ multi_json (~> 1.2)
+ jquery-rails (4.0.5)
+ rails-dom-testing (~> 1.0)
+ railties (>= 4.2.0)
+ thor (>= 0.14, < 2.0)
+ jquery-turbolinks (2.1.0)
+ railties (>= 3.1.0)
+ turbolinks
+ jquery-ui-rails (5.0.5)
+ railties (>= 3.2.16)
+ json (1.8.3)
+ kaminari (0.16.3)
+ actionpack (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ libv8 (3.16.14.11)
+ locastyle (0.0.1)
+ loofah (2.0.3)
+ nokogiri (>= 1.5.9)
+ mail (2.6.3)
+ mime-types (>= 1.16, < 3)
+ memoizable (0.4.2)
+ thread_safe (~> 0.3, >= 0.3.1)
+ mime-types (2.6.2)
+ mimemagic (0.3.0)
+ mina (0.3.7)
+ open4 (~> 1.3.4)
+ rake
+ mini_portile (0.6.2)
+ minitest (5.8.1)
+ multi_json (1.11.2)
+ nenv (0.2.0)
+ netrc (0.10.3)
+ nokogiri (1.6.6.2)
+ mini_portile (~> 0.6.0)
+ open4 (1.3.4)
+ orientdb4r (0.5.1)
+ rest-client (~> 1.7)
+ orm_adapter (0.5.0)
+ paperclip (4.3.1)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ cocaine (~> 0.5.5)
+ mime-types
+ mimemagic (= 0.3.0)
+ parser (2.2.2.6)
+ ast (>= 1.1, < 3.0)
+ pg (0.18.3)
+ procto (0.0.2)
+ puma (2.14.0)
+ rack (1.6.4)
+ rack-cors (0.4.0)
+ rack-mini-profiler (0.9.7)
+ rack (>= 1.1.3)
+ rack-protection (1.5.3)
+ rack
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rails (4.2.0)
+ actionmailer (= 4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
+ activemodel (= 4.2.0)
+ activerecord (= 4.2.0)
+ activesupport (= 4.2.0)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.2.0)
+ sprockets-rails
+ rails-deprecated_sanitizer (1.0.3)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.7)
+ activesupport (>= 4.2.0.beta, < 5.0)
+ nokogiri (~> 1.6.0)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ rails-html-sanitizer (1.0.2)
+ loofah (~> 2.0)
+ railties (4.2.0)
+ actionpack (= 4.2.0)
+ activesupport (= 4.2.0)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rainbow (2.0.0)
+ rake (10.4.2)
+ rake-compiler (0.9.5)
+ rake
+ rdoc (4.2.0)
+ redis (3.2.1)
+ redis-namespace (1.5.2)
+ redis (~> 3.0, >= 3.0.4)
+ reek (1.6.5)
+ parser (~> 2.2.0.pre.7)
+ rainbow (>= 1.99, < 3.0)
+ unparser (~> 0.2.2)
+ ref (2.0.0)
+ responders (2.1.0)
+ railties (>= 4.2.0, < 5)
+ rest-client (1.8.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 3.0)
+ netrc (~> 0.7)
+ rmagick (2.15.4)
+ rsolr (1.0.12)
+ builder (>= 2.1.2)
+ rspec-logsplit (0.1.3)
+ ruby_parser (3.7.1)
+ sexp_processor (~> 4.1)
+ rubycritic (1.4.0)
+ flay (= 2.4.0)
+ flog (= 4.2.1)
+ parser (>= 2.2.0, < 3.0)
+ reek (= 1.6.5)
+ virtus (~> 1.0)
+ sass (3.4.18)
+ sass-rails (5.0.4)
+ railties (>= 4.0.0, < 5.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ sdoc (0.4.1)
+ json (~> 1.7, >= 1.7.7)
+ rdoc (~> 4.0)
+ select2-rails (4.0.0)
+ thor (~> 0.14)
+ sexp_processor (4.6.0)
+ shoulda (3.5.0)
+ shoulda-context (~> 1.0, >= 1.0.1)
+ shoulda-matchers (>= 1.4.1, < 3.0)
+ shoulda-callback-matchers (1.1.3)
+ activesupport (>= 3)
+ shoulda-context (1.2.1)
+ shoulda-matchers (2.8.0)
+ activesupport (>= 3.0.0)
+ sidekiq (3.5.0)
+ celluloid (~> 0.17.0)
+ connection_pool (~> 2.2, >= 2.2.0)
+ json (~> 1.0)
+ redis (~> 3.2, >= 3.2.1)
+ redis-namespace (~> 1.5, >= 1.5.2)
+ sinatra (1.4.6)
+ rack (~> 1.4)
+ rack-protection (~> 1.4)
+ tilt (>= 1.3, < 3)
+ slim (3.0.6)
+ temple (~> 0.7.3)
+ tilt (>= 1.3.3, < 2.1)
+ spring (1.4.0)
+ sprockets (3.3.5)
+ rack (> 1, < 3)
+ sprockets-rails (2.3.3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (>= 2.8, < 4.0)
+ sqlite3 (1.3.10)
+ stackprof (0.2.7)
+ streamio-ffmpeg (1.0.0)
+ temple (0.7.6)
+ therubyracer (0.12.2)
+ libv8 (~> 3.16.14.0)
+ ref
+ thor (0.19.1)
+ thread_safe (0.3.5)
+ tilt (2.0.1)
+ timers (4.1.1)
+ hitimes
+ turbolinks (2.5.3)
+ coffee-rails
+ tzinfo (1.2.2)
+ thread_safe (~> 0.1)
+ uglifier (2.7.2)
+ execjs (>= 0.3.0)
+ json (>= 1.8.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.1)
+ uniform_notifier (1.9.0)
+ unparser (0.2.4)
+ abstract_type (~> 0.0.7)
+ adamantium (~> 0.2.0)
+ concord (~> 0.1.5)
+ diff-lcs (~> 1.2.5)
+ equalizer (~> 0.0.9)
+ parser (~> 2.2.2)
+ procto (~> 0.0.2)
+ virtus (1.0.5)
+ axiom-types (~> 0.1)
+ coercible (~> 1.0)
+ descendants_tracker (~> 0.0, >= 0.0.3)
+ equalizer (~> 0.0, >= 0.0.9)
+ warden (1.2.3)
+ rack (>= 1.0)
+ web-console (2.2.1)
+ activemodel (>= 4.0)
+ binding_of_caller (>= 0.7.2)
+ railties (>= 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ whenever (0.9.4)
+ chronic (>= 0.6.3)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bcrypt (~> 3.1.7)
+ better_errors
+ bootstrap-sass
+ bullet
+ byebug
+ chart-js-rails
+ coffee-rails (~> 4.1.0)
+ curb (~> 0.8.8)
+ dalli
+ devise
+ devise_token_auth
+ dspace_rest_client (~> 1.1.0)
+ execjs
+ flamegraph
+ gruff
+ jbuilder (~> 2.0)
+ jquery-rails
+ jquery-turbolinks
+ jquery-ui-rails
+ kaminari
+ locastyle
+ mina
+ orientdb4r
+ paperclip
+ pg
+ puma
+ rack-cors
+ rack-mini-profiler
+ rails (= 4.2.0)
+ rdoc
+ rmagick
+ rsolr (~> 1.0.12)
+ rubycritic
+ sass-rails (~> 5.0)
+ sdoc (~> 0.4.0)
+ select2-rails
+ shoulda
+ shoulda-callback-matchers (~> 1.1.1)
+ sidekiq
+ sinatra
+ slim
+ spring
+ sqlite3
+ stackprof
+ streamio-ffmpeg (~> 1.0.0)
+ therubyracer
+ turbolinks
+ uglifier (>= 1.3.0)
+ web-console (~> 2.0)
+ whenever
diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js
index c121b221fc896c27fc80bd1036b28644ef89f29f..7a907ae34bac5eec8e7a310b5118d56de4541a4f 100644
--- a/app/assets/javascripts/application/accessibility.js
+++ b/app/assets/javascripts/application/accessibility.js
@@ -44,7 +44,7 @@ var fontSize = function() {
//// contrast
var contrast = function() {
- var contrast_elements = 'body, .barra-brasil, .search-bar, .learning-object-vertical .panel, .navbar, .well';
+ var contrast_elements = 'body, .barra-brasil, .search-bar, .learning-object-vertical .panel, .navbar, .well, .grey-panel, .btn, .user-header';
// init
$(document).ready(function() {
@@ -60,6 +60,8 @@ var contrast = function() {
$('#menu-bar').removeClass('menu-bar-contrast');
$('.navbar-header').removeClass('set-Colecao');
$('.caret').css('border-top',' 7px solid black');
+ $('.grey-panel').css('border','none');
+ $('.button-cancel-setup').css('font-weight','normal');
var select = $('.select-tag-container').select2()
.on("select2:open", function() {
@@ -79,6 +81,8 @@ var contrast = function() {
$('#menu-bar').addClass('menu-bar-contrast');
$('.navbar-header').addClass('set-Colecao');
$('.caret').css('border-top',' 7px solid white');
+ $('.grey-panel').css('border','7px solid white');
+ $('.button-cancel-setup').css('font-weight','bold');
//contraste select2(menu esquerda)
var select = $('.select-tag-container').select2()
@@ -129,3 +133,11 @@ function readCookie(name) {
// define global variables
var fontSize = fontSize();
var contrast = contrast();
+
+/*
+function HandleBrowseClick()
+{
+ var fileinput = document.getElementById("browse");
+ fileinput.click();
+}
+*/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 1de2bc957262386941abcb2a5913b14436b38463..2994715eff8149838cb342ba9fde7f7b9a3a8c5b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -281,7 +281,7 @@ footer {
color: #FFF;
.main {
- background-color: #313131;
+ background-color: #E6E6E6;
padding: 16px 0px 0px 0px;
min-height: 256px;
}
@@ -290,6 +290,26 @@ footer {
padding: 16px;
background-color: #AAB1AD;
}
+ .footer-bar {
+ color: #FFF;
+ background-color: #2178F5;
+ padding-top: 8px;
+
+ .logo {
+ margin-top: 10px;
+ padding: 0;
+ text-align: center;
+ float: left;
+ width: 165px;
+ h3 {
+ margin-top: 10px;
+ font-weight: 400;
+ }
+ a {
+ color: #FFF;
+ }
+ }
+ }
}
.starRating:not(old) {
@@ -365,7 +385,6 @@ table.tipo1 p {
color: white !important;
}
}
-
#search {
.form-control {
background-color: black !important;
@@ -396,6 +415,37 @@ table.tipo1 p {
border-style: outset;
}
}
+ .btn{
+ border:2px solid white;
+ }
+ .user-header {
+ border: 7px solid white;
+ h3{
+ color:white;
+ }
+ .btn{
+ border: 2px solid white;
+ }
+ }
+ .grey-panel{
+ input{
+ color: black;
+ font-weight: bold;
+ }
+ .button-save-setup{
+ color:yellow;
+ }
+ }
+ footer {
+
+ .footerbar{
+ background-color: black;
+ }
+ .footer-bar {
+ border:2px solid white;
+ background-color: black;
+ }
+ }
}
.menu-bar-contrast {
@@ -502,3 +552,52 @@ input.chk {
.white-input input{
border:none;
}
+
+.top-padding-setup{
+ margin-top: 25px;
+}
+.input-width-setup1{
+ width:370px;
+}
+.input-setup-name{
+ width:515px;
+ height:60px;
+ font-size:18pt;
+ font-weight:bold;
+ margin-bottom: 5px;
+}
+.link-setup{
+ color: #1676bc;
+}
+.link-setup-2{
+ color: #FF3300;
+}
+.button-cancel-setup{
+ height: 35px; width: 110px; color:white; background-color: #FF3300;
+}
+.button-save-setup{
+ height: 35px; width: 110px; color:white; background-color: #1676bc;
+}
+.logos-footer{
+ height: 70px;
+ width: auto;
+}
+.btn-file {
+ position: relative;
+ overflow: hidden;
+}
+.btn-file input[type=file] {
+ position: absolute;
+ top: 0;
+ right: 0;
+ min-width: 100%;
+ min-height: 100%;
+ font-size: 100px;
+ text-align: right;
+ filter: alpha(opacity=0);
+ opacity: 0;
+ outline: none;
+ background: white;
+ cursor: inherit;
+ display: block;
+}
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index c2c488bf17bb0e0724da814366a44b4d7b51368b..40a46556efd05565a2cc952aa7743ec81ae32047 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,59 +1,57 @@
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, multipart: true}) do |f| %>
- <%= devise_error_messages! %>
+<%= devise_error_messages! %>
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="grey-panel">
<div class="container-fluid">
<div class="col-md-8">
-
<div class="row">
<div class="white-input">
- <div class="col-md-2">
- <%= image_tag image_path('user-anon.png'), class: "logo" %>
- <br/>
- <%= link_to 'editar foto', search_path,style:'color: #1676bc;' %><br/><%= f.file_field :avatar %>
+ <div class="col-md-2"><br/>
+ <%= image_tag image_path('user-anon.png'), class: "logo top-padding-setup" %>
+ <!-- <%= link_to 'editar foto','#',{:onclick=>'HandleBrowseClick()',class:'link-setup'} %><br/>
+ <input type="file" id="browse" name="avatar" style="display: none" />-->
+ </br><span class=" btn-file"><%= link_to 'editar foto','#',class:'link-setup'%><%= f.file_field :avatar%></span>
</div>
<div class="col-md-10">
<div style="text-align:left">
- <%= f.text_field :name, autofocus: true, required: true, style:"width:515px; height:60px;font-size:18pt;font-weight:bold; margin-bottom: 5px;" %>
- <input type="text" size="55" placeholder="Nome instituição">
- </div>
- <span class="pull-right"><input type="checkbox"> Conta de instituição</span><br/><br/>
- <div style="text-align:left">
+ Senha Atual: <%= f.password_field :current_password, autocomplete: "off" ,class:'input-width-setup1' %><br/>
+ <span class="pull-right">
+ <div style="margin-bottom: 5px">
+ <%= link_to 'Esqueci a senha', 'search_path', :class=>'link-setup'%>
+ </div>
+ </span><br/>
+ <%= f.text_field :name, autofocus: true, required: true, class:'input-setup-name top-padding-setup' %>
+ <input type="text" size="55" placeholder="Nome instituição">
+ </div>
+ <span class="pull-right"><input type="checkbox"> Conta de instituição</span><br/><br/>
+ <div style="text-align:left">
Email:
<%= f.email_field :email, autofocus: true, style:"width:445px;" %>
- <br/><br/>
- <b>Alterar senha</b><br/>
-
+ <br/><br/>
+ <b>Alterar senha</b>
<table style="margin: 20px auto;">
<tr>
- <td>Senha atual:</td><td> <%= f.password_field :current_password, autocomplete: "off" ,style:"width:370px;" %></td>
- </tr>
- <tr>
- <td colspan="2"><span class="pull-right"><div style="margin-bottom: 5px"><%= link_to 'Esqueci a senha', search_path, style:'color: #1676bc;'%></div></span></td>
+ <td> <div style="margin-bottom: 15px"> Nova senha:</div></td><td> <%= f.password_field :password, autocomplete: "off",class:'input-width-setup1' %></td>
</tr>
<tr>
- <td> <div style="margin-bottom: 15px"> Nova senha:</div></td><td> <%= f.password_field :password, autocomplete: "off",style:"width:370px;" %></td>
- </tr>
- <tr>
- <td> Confirmar senha:</td><td> <%= f.password_field :password_confirmation, autocomplete: "off" ,style:"width:370px;"%></td>
+ <td> Confirmar senha:</td><td> <%= f.password_field :password_confirmation, autocomplete: "off" ,class:'input-width-setup1'%></td>
</tr>
</table>
<b>Conta</b><br/>
- <div style="margin: 5px 5px;">
- <%= link_to 'Deletar conta', search_path, style:'color: #FF3300;'%>
- <!-- <%= button_to "Deletar conta", registration_path(resource_name), data: {confirm: "Are you sure?"}, method: :delete, style:'color: #FF3300;' %>
- --></div>
-
+ <div style="margin: 5px 5px;">
+ <%= link_to 'Deletar conta', search_path, class:'link-setup-2'%>
+ <!-- <%= button_to "Deletar conta", registration_path(resource_name), data: {confirm: "Are you sure?"}, method: :delete, style:'color: #FF3300;' %>-->
+ </div>
</div>
</div>
</div>
- </div>
+ </div>
</div>
<div class="col-md-4">
- <%= link_to 'Cancelar',:back, class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #FF3300;' %>
- <%= f.submit "Salvar",class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #1676bc;' %>
+ <%= link_to 'Cancelar',:back, class: "btn button-cancel-setup" %>
+ <%= f.submit 'Salvar',class: "btn button-save-setup" %>
</div>
</div>
</div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index fe3d444de41b7cc9b1e52de9de517ada33b80035..5ebf33bcdac285f2677b14cc45f10d5967d91049 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -31,7 +31,7 @@
<%= f.label :remember_me %>
</div>
<% end -%>
- <%= link_to "Esqueceu sua senha?", new_password_path(resource_name) , style:'color: #FF3300;' %>
+ <%= link_to "Esqueceu sua senha?", new_password_path(resource_name) , class:'link-setup-2' %>
</span></td>
</tr>
</table>
@@ -43,7 +43,7 @@
<div class="col-md-7">
<span class="pull-right">Não possui conta?</span><br/>
<span class="pull-right">
- <%= link_to "Cadastre-se", new_registration_path(resource_name),style:'color: #1676bc;' %>
+ <%= link_to "Cadastre-se", new_registration_path(resource_name),class:'link-setup' %>
</span>
</div>
<div class=" col-md-3">
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index f93c9927760161f92d5731a933dc956928ae4070..ee0767735fb68983bb581ba7a1a1c9630ecd7a3a 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -16,19 +16,18 @@
<h3 class="dropdown open">Matérias<span class="caret caret-align-right"/></h3>
<div class="dropdown-element">
+
<% @subjects.each do |subject|%>
<label class="label-checkbox"><h4><%= subject %><input value="<%= subject %>" name="filter-subject" type="checkbox"/></h4></label><br>
<% end %>
</div>
<!-- <div class="dropdown-element">
- <h4 class="dropdown">Matemática<span class="caret caret-align-right"/></h4>
-
+ <h4 class="dropdown">Arte<span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
- <option value="Conjunto">Conjuntos</option>
- <option value="Soma">Soma</option>
- <option value="Algebra">Ãlgebra</option>
+ <option value="Pinturas">Conjuntos</option>
+ <option value="Historia">História Da Arte</option>
</select>
</div>
<h4 class="dropdown">Biologia<span class="caret caret-align-right"/></h4>
@@ -41,13 +40,13 @@
<option value="">...</option>
</select>
</div>
- <h4 class="dropdown">História<span class="caret caret-align-right"/></h4>
+ <h4 class="dropdown">Ciências<span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
<option value="">Todos</option>
<optgroup label="Básico">
- <option value="">História do Brasil</option>
+ <option value="">...</option>
<option value="">...</option>
</optgroup>
<optgroup label="Avançada">
@@ -55,7 +54,7 @@
</optgroup>
</select>
</div>
- <h4 class="dropdown">LÃngua Portuguesa<span class="caret caret-align-right"/></h4>
+ <h4 class="dropdown">Educação FÃsica<span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
@@ -69,7 +68,7 @@
</optgroup>
</select>
</div>
- <h4 class="dropdown">Geografia<span class="caret caret-align-right"/></h4>
+ <h4 class="dropdown">Ensino Religioso<span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
@@ -83,7 +82,7 @@
</optgroup>
</select>
</div>
- <h4 class="dropdown">Ciências<span class="caret caret-align-right"/></h4>
+ <h4 class="dropdown">FÃsica<span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
@@ -97,7 +96,7 @@
</optgroup>
</select>
</div>
- <h4 class="dropdown">Educação FÃsica<span class="caret caret-align-right"/></h4>
+ <h4 class="dropdown">Filosofia<span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
@@ -111,7 +110,34 @@
</optgroup>
</select>
</div>
- <h4 class="dropdown">Inglês<span class="caret caret-align-right"/></h4>
+ <h4 class="dropdown">Geografia<span class="caret caret-align-right"/></h4>
+ <div>
+ <select class="select-tag-container filter-subject" multiple="multiple">
+ <option value="">Todos</option>
+ <optgroup label="Básico">
+ <option value="">...</option>
+ <option value="">...</option>
+ </optgroup>
+ <optgroup label="Avançada">
+ <option value="">...</option>
+ </optgroup>
+ </select>
+ </div>
+ <h4 class="dropdown">História<span class="caret caret-align-right"/></h4>
+
+ <div>
+ <select class="select-tag-container filter-subject" multiple="multiple">
+ <option value="">Todos</option>
+ <optgroup label="Básico">
+ <option value="">História do Brasil</option>
+ <option value="">...</option>
+ </optgroup>
+ <optgroup label="Avançada">
+ <option value="">...</option>
+ </optgroup>
+ </select>
+ </div>
+ <h4 class="dropdown"> LÃngua estrangeira moderna <span class="caret caret-align-right"/></h4>
<div>
<select class="select-tag-container filter-subject" multiple="multiple">
@@ -125,6 +151,46 @@
</optgroup>
</select>
</div>
+ <h4 class="dropdown">LÃngua Portuguesa<span class="caret caret-align-right"/></h4>
+ <div>
+ <select class="select-tag-container filter-subject" multiple="multiple">
+ <option value="">Todos</option>
+ <optgroup label="Básico">
+ <option value="">...</option>
+ <option value="">...</option>
+ </optgroup>
+ <optgroup label="Avançada">
+ <option value="">...</option>
+ </optgroup>
+ </select>
+ </div>
+ <h4 class="dropdown">Matemática<span class="caret caret-align-right"/></h4>
+
+ <div>
+ <select class="select-tag-container filter-subject" multiple="multiple">
+ <option value="Conjunto">Conjuntos</option>
+ <option value="Soma">Soma</option>
+ <option value="Algebra">Ãlgebra</option>
+ </select>
+ </div>
+ <h4 class="dropdown">QuÃmica<span class="caret caret-align-right"/></h4>
+
+ <div>
+ <select class="select-tag-container filter-subject" multiple="multiple">
+ <option value="">..</option>
+ <option value="">..</option>
+ <option value="">..</option>
+ </select>
+ </div>
+ <h4 class="dropdown">Sociologia<span class="caret caret-align-right"/></h4>
+
+ <div>
+ <select class="select-tag-container filter-subject" multiple="multiple">
+ <option value="">..</option>
+ <option value="">..</option>
+ <option value="">..</option>
+ </select>
+ </div>
</div> -->
<!--fim materias -->
<% unless @types.blank? %>
diff --git a/app/views/shared/application/_footer.html.erb b/app/views/shared/application/_footer.html.erb
index f4a0e006f9c86fa03d51a58800c8cb4faa021331..014c5cf79625e26d81357cb43b275a7678411891 100644
--- a/app/views/shared/application/_footer.html.erb
+++ b/app/views/shared/application/_footer.html.erb
@@ -1,30 +1,44 @@
<footer>
- <div class="main" style="background-color: #E6E6E6;">
+ <div class="footer-bar">
+ <div class="row">
+ <div class="col-md-offset-5 col-md-4">
+ <div class="logo" >
+ <%= link_to root_path do %>
+ <%= image_tag image_path("logo.png"), class: "logo",style: 'margin-top:15px;'%>
+ <h3>CONTEÚDO EDUCACIONAL</h3>
+ <br/>
+ <% end %>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="main">
<div class="container" style="min-height: 200px;">
<div class="col-md-12" style="padding-top: 50px">
<div class="logo-footer">
<%= link_to 'http://www.brasil.gov.br/' do %>
- <%= image_tag 'logo_brasil.png', style: 'width: auto; height: 70px;' %>
+ <%= image_tag 'logo_brasil.png',class:'logos-footer' %>
<% end %>
</div>
<div class="logo-footer">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo_ministerio.png', height: '70', style: 'width: auto; height: 70px; margin-left: 18%;' %>
+ <%= image_tag 'logo_ministerio.png',class:'logos-footer', style: ' margin-left: 18%;' %>
<% end %>
</div>
<div class="logo-footer">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'fnde.png', height: '70', style: 'width: auto; height: 100px; margin-top: -8%;' %>
+ <%= image_tag 'fnde.png', style: 'width: auto; height: 100px; margin-top: -8%;' %>
<% end %>
</div>
<div class="logo-footer">
<%= link_to 'http://www.ufpr.br/portalufpr/' do %>
- <%= image_tag 'logo_ufpr.jpg', height: '100', style: 'width: auto; height: 70px;'%>
+ <%= image_tag 'logo_ufpr.jpg',class:'logos-footer'%>
<% end %>
</div>
<div class="logo-footer">
<%= link_to 'http://www.c3sl.ufpr.br/' do %>
- <%= image_tag 'logo_c3.png', style: 'width: auto; height: 70px;'%>
+ <%= image_tag 'logo_c3.png', class:'logos-footer'%>
<% end %>
</div>
</div>
diff --git a/app/views/users/me.html.erb b/app/views/users/me.html.erb
index f40a65208f4747137657d6f5df7ed526d4e08c44..643658c40dfbfe5188d81a301fc1407fa67661cb 100644
--- a/app/views/users/me.html.erb
+++ b/app/views/users/me.html.erb
@@ -49,4 +49,4 @@
<% end %>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/orientdb.yml b/config/orientdb.yml
index 2e82b05f6b5550a5c1f14e5ba5290eaee0154ffc..33d7dae7cccd737915522aaa7ff9abc3ac34f4fb 100644
--- a/config/orientdb.yml
+++ b/config/orientdb.yml
@@ -10,4 +10,4 @@ test:
database: PortalMEC
username: admin
password: admin
- port: 2480
\ No newline at end of file
+ port: 2480