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

Merge branch 'master' into file_upload

parents af40768e 0020e62e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 23189 additions and 118726 deletions
app/assets/stylesheets/application.scss
+ 8
− 1
View file @ c45bdec7
......@@ -658,4 +658,11 @@ input.chk {
.navbar-inverse {
background: #59595C;
border-color: #59595C;
}
\ No newline at end of file
}
.align-everything{
line-height: 170%;
}
.field_with_errors {
display: inline;
}
app/repositories/orient_db/learning_object/relation.rb
+ 2
− 1
View file @ c45bdec7
......@@ -3,8 +3,9 @@ module OrientDb
class Relation < OrientDb::Relation
include OrientDb::Methods::EdgeMethods
def initialize(learning_object)
def initialize(learning_object, connection)
@learning_object = learning_object
@connection = connection
end
end
......
app/repositories/orient_db/learning_object/relations_chain.rb
+ 3
− 3
View file @ c45bdec7
......@@ -4,9 +4,9 @@ module OrientDb
def relations
[
OrientDb::LearningObject::SubjectsRelations.new(object),
OrientDb::LearningObject::AttributesRelations.new(object),
OrientDb::LearningObject::PublisherRelation.new(object)
OrientDb::LearningObject::SubjectsRelations.new(object, connection),
OrientDb::LearningObject::AttributesRelations.new(object, connection),
OrientDb::LearningObject::PublisherRelation.new(object, connection)
]
end
......
app/repositories/orient_db/relation.rb
+ 3
− 1
View file @ c45bdec7
......@@ -2,7 +2,7 @@ module OrientDb
##abstract class Relation
class Relation
def can_create?
raise NotImplementedError, 'Relation#can_execute? is an abstract method.'
end
......@@ -13,6 +13,8 @@ module OrientDb
protected
attr_accessor :connection
def execute
raise NotImplementedError, 'Relation#execute is an abstract method.'
end
......
app/repositories/orient_db/relation_chain.rb
+ 3
− 2
View file @ c45bdec7
module OrientDb
class RelationChain
attr_reader :object
attr_reader :object, :connection
def initialize(object)
def initialize(object, connection)
@object = object
@connection = connection
end
def create
......
app/repositories/orient_db/subject/relation.rb
+ 2
− 1
View file @ c45bdec7
......@@ -3,8 +3,9 @@ module OrientDb
class Relation < OrientDb::Relation
include OrientDb::Methods::EdgeMethods
def initialize(subject)
def initialize(subject, connection)
@subject = subject
@connection = connection
end
end
......
app/repositories/orient_db/subject/relations_chain.rb
+ 2
− 2
View file @ c45bdec7
......@@ -4,8 +4,8 @@ module OrientDb
def relations
[
OrientDb::Subject::SubtopicsRelations.new(object),
OrientDb::Subject::SupertopicsRelations.new(object)
OrientDb::Subject::SubtopicsRelations.new(object, connection),
OrientDb::Subject::SupertopicsRelations.new(object, connection)
]
end
......
app/views/devise/registrations/new.html.erb
+ 30
− 45
View file @ c45bdec7
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="grey-panel">
<div class="center_data">
<div class="style-cadastro">
<h2>
<font>Cadastre-se</font>
</h2><br/>
<h2><font>Cadastre-se</font></h2><br/>
</div>
<font>
<%= image_tag image_path("user-anon.png")%><br/>
......@@ -16,51 +12,40 @@
<%=link_to 'adicionar foto', '#', { :class=>"add-picture"}%>
<%= f.file_field :avatar%>
</div>
</font><br/></br>
<div class="col-md-10">
<p style="line-height: 170%">
<div class="col-md-10">
<span class="pull-right">Nome:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%></span><br/>
</p>
<p style="line-height: 15%"><br/></p>
<p style="line-height: 170%">
<span class="pull-right">Email:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %></span><br/>
</p>
<p style="line-height: 15%"><br/></p>
<p style="line-height: 170%">
<span class="pull-right">Senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.password_field :password, autocomplete: "off", style:"width:335px;" %><br/>
</font><br/><br/>
<div class="col-md-11">
<div class="field_with_errors">
<div class="align-everything">
Nome:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%>
<p style="line-height: 15%"><br/></p>
Email:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %><br/>
<p style="line-height: 15%"><br/></p>
Senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.password_field :password, autocomplete: "off", style:"width:335px;" %>
<% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> caracteres mínimos)</em>
<% end %><br/>
</span>
<br/></p></div>
<p style="line-height: 15%"><br/></p>
<p style="line-height: 170%">
<div class="col-md-10">
<span class="pull-right">Confirmar senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.password_field :password_confirmation, autocomplete: "off", style:"width:335px;" %>
</span>
</div><br/><br/></p>
<em><p>(<%= @minimum_password_length %> caracteres mínimos)</p></em>
<% end %>
<div class="col-md-11">
Confirmar senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= f.password_field :password_confirmation, autocomplete: "off", style:"width:335px;" %>
</div></div></div>
</div>
<div class="container-fluid">
<div class="col-md-offset-3 col-md-5">
<div class="center_data">
<div class="col-md-6">
<br/><span class="pull-right">Já possui conta?</span><br/>
<span class="pull-right"><%= render "devise/shared/links"%></span>
</div>
<div class="container-fluid">
<div class="col-md-offset-3 col-md-5">
<div class="center_data">
<div class="col-md-6">
<br/><span class="pull-right">Já possui conta?</span><br/>
<span class="pull-right"><%= render "devise/shared/links"%></span>
</div>
<div class=" col-md-5">
<br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc" %></span><br/>
</div>
</div>
</div>
<div class=" col-md-5">
<br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc" %></span><br/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<% end %>
autocomplete/brazilian.txt
+ 23136
− 118670
View file @ c45bdec7
Source diff could not be displayed: it is too large. Options to address this: view the blob.
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