From 2b6afcc00efa794bd731ac075f3561f2b7439a80 Mon Sep 17 00:00:00 2001
From: Ina <inaloena@gmail.com>
Date: Fri, 23 Oct 2015 11:55:26 -0200
Subject: [PATCH] setup contrast
---
.../javascripts/application/accessibility.js | 11 ++-
app/assets/stylesheets/application.scss | 24 +++++
app/views/devise/registrations/edit.html.erb | 46 +++++-----
app/views/search/index.html.erb | 89 ++++++++++++++++---
config/orientdb.yml | 4 +-
5 files changed, 134 insertions(+), 40 deletions(-)
diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js
index c121b221f..d57902f8e 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';
// init
$(document).ready(function() {
@@ -60,6 +60,7 @@ 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');
var select = $('.select-tag-container').select2()
.on("select2:open", function() {
@@ -79,6 +80,7 @@ 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');
//contraste select2(menu esquerda)
var select = $('.select-tag-container').select2()
@@ -129,3 +131,10 @@ 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 971c9ef3f..aec820a1c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -393,6 +393,10 @@ table.tipo1 p {
border-style: outset;
}
}
+ .btn{
+ border:2px solid white;
+ }
+
}
.menu-bar-contrast {
@@ -507,3 +511,23 @@ input.chk {
.white-input input{
border:none;
}
+
+.top-padding-setup{
+ margin-top: 25px;
+}
+.input-width-setup1{
+ width:370px;
+}
+
+.link-setup{
+ color: #1676bc;
+}
+.link-setup-delete{
+ 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;
+}
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index c2c488bf1..b61df02d0 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,59 +1,53 @@
<%= 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="fileupload" style="display: none" />
+ <!--</br><%= f.file_field :avatar %>-->
</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>
+ 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, style:"width:515px; height:60px;font-size:18pt;font-weight:bold; margin-bottom: 5px;",class:'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/>
-
+ <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>
-
+ <%= link_to 'Deletar conta', search_path, class:'link-setup-delete'%>
+ <!-- <%= 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/search/index.html.erb b/app/views/search/index.html.erb
index 796b7fa4d..1b6184f11 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -16,13 +16,12 @@
<h3 class="dropdown open">Matérias<span class="caret caret-align-right"/></h3>
<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>
@@ -35,13 +34,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">
@@ -49,7 +48,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">
@@ -63,7 +62,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">
@@ -77,7 +76,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">
@@ -91,7 +90,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">
@@ -105,7 +104,7 @@
</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">
@@ -119,6 +118,74 @@
</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">
+ <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">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 -->
<h3 class="dropdown open">Conteúdo<span class="caret caret-align-right"/></h3><!--Tipo 1-->
diff --git a/config/orientdb.yml b/config/orientdb.yml
index 33d7dae7c..e0399966b 100644
--- a/config/orientdb.yml
+++ b/config/orientdb.yml
@@ -1,8 +1,8 @@
development: &development
host: localhost
database: portalmec
- username: admin
- password: admin
+ username: root
+ password: root
port: 2480
test:
--
GitLab